Resolve #1990

remove opcache installation from docker build

.docker/release/Dockerfile

@@ -1,51 +1,192 @@
+# syntax=docker/dockerfile:1
+
+FROM alpine:3.24.3 AS builder
+RUN apk add --no-cache php85 php85-json php-phar php-zip
+RUN apk add --no-cache npm
+RUN npm install -g gulp yarn
+WORKDIR /source
+COPY package.json yarn.lock ./
+RUN yarn install
+COPY . .
+# Patch release.php with hotfix from: https://github.com/xgbstar1/snappymail-docker/blob/main/Dockerfile, so that release.php doesn't fail with error
+RUN sed -i 's_^if.*rename.*snappymail.v.0.0.0.*$_if (!!system("mv snappymail/v/0.0.0 snappymail/v/{$package->version}")) {_' cli/release.php  || true
+RUN php release.php
+RUN set -eux; \
+    VERSION=$( ls build/dist/releases/webmail ); \
+    ls -al build/dist/releases/webmail/$VERSION/snappymail-$VERSION.tar.gz; \
+    mkdir -p /snappymail; \
+    tar -zxvf build/dist/releases/webmail/$VERSION/snappymail-$VERSION.tar.gz -C /snappymail; \
+    find /snappymail -type d -exec chmod 550 {} \; ; \
+    find /snappymail -type f -exec chmod 440 {} \; ; \
+    find /snappymail/data -type d -exec chmod 750 {} \; ; \
+    # Remove unneeded files
+    rm -v /snappymail/README.md /snappymail/_include.php
+
 # Inspired by the original Rainloop dockerfile from youtous on GitLab
-FROM php:8.1-fpm-bullseye
+FROM php:8.5-fpm-alpine AS final
 
-ARG FILES_ZIP
-
-
-
-LABEL org.label-schema.description="SnappyMail webmail client image using nginx, php-fpm based on Debian Buster"
-
-ENV UID=991 GID=991 UPLOAD_MAX_SIZE=25M LOG_TO_STDERR=true MEMORY_LIMIT=128M SECURE_COOKIES=true
-ENV fpm.pool.clear_env=false
+LABEL org.label-schema.description="SnappyMail webmail client image using nginx, php-fpm on Alpine"
 
 # Install dependencies such as nginx
-RUN mkdir -p /usr/share/man/man1/ /usr/share/man/man3/ /usr/share/man/man7/ && \
-    apt-get update -q --fix-missing && \
-    apt-get -y upgrade && \
-    apt-get install --no-install-recommends -y \
-        apt-transport-https gnupg openssl wget curl ca-certificates nginx supervisor sudo \
-        unzip libzip-dev libxml2-dev libldb-dev libldap2-dev \
-        sqlite3 libsqlite3-dev libsqlite3-0 libpq-dev postgresql-client mariadb-client logrotate \
-        zip mlocate libpcre3-dev libicu-dev \
-        build-essential chrpath libssl-dev \
-        libxft-dev libfreetype6 libfreetype6-dev \
-        libpng-dev libjpeg62-turbo-dev \
-        libfontconfig1 libfontconfig1-dev \
-        && \
-    rm -rf /var/lib/apt/lists/*
+RUN apk add --no-cache ca-certificates nginx supervisor bash
 
 # Install PHP extensions
-RUN php -m && \
-    docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ && \
-    docker-php-ext-configure intl && \
-    docker-php-ext-configure gd --with-freetype --with-jpeg && \
-    docker-php-ext-install ldap opcache pdo_mysql pdo_pgsql zip intl gd && \
-    php -m
+# apcu
+RUN set -eux; \
+    apk add --no-cache --virtual .build-dependencies $PHPIZE_DEPS; \
+    pecl install apcu; \
+    docker-php-ext-enable apcu; \
+    docker-php-source delete; \
+    apk del .build-dependencies;
+
+# gd
+RUN set -eux; \
+    apk add --no-cache freetype libjpeg-turbo libpng; \
+    apk add --no-cache --virtual .deps freetype-dev libjpeg-turbo-dev libpng-dev; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg; \
+    docker-php-ext-install gd; \
+    apk del .deps
+
+# gmagick
+# RUN set -eux; \
+#     apk add --no-cache graphicsmagick libgomp; \
+#     apk add --no-cache --virtual .deps graphicsmagick-dev libtool; \
+#     apk add --no-cache --virtual .build-dependencies $PHPIZE_DEPS; \
+#     pecl install gmagick-2.0.6RC1; \
+#     docker-php-ext-enable gmagick; \
+#     docker-php-source delete; \
+#     apk del .build-dependencies; \
+#     apk del .deps
+
+# gnupg
+RUN set -eux; \
+    apk add --no-cache gnupg gpgme; \
+    apk add --no-cache --virtual .deps gpgme-dev; \
+    apk add --no-cache --virtual .build-dependencies $PHPIZE_DEPS; \
+    pecl install gnupg; \
+    docker-php-ext-enable gnupg; \
+    docker-php-source delete; \
+    apk del .build-dependencies; \
+    apk del .deps
+
+# imagick
+RUN set -eux; \
+    apk add --no-cache imagemagick libgomp; \
+    apk add --no-cache --virtual .deps imagemagick-dev; \
+    apk add --no-cache --virtual .build-dependencies $PHPIZE_DEPS; \
+    echo | pecl install imagick; \
+    docker-php-ext-enable imagick; \
+    docker-php-source delete; \
+    apk del .build-dependencies; \
+    apk del .deps
+
+# intl
+RUN set -eux; \
+    apk add --no-cache icu-libs; \
+    apk add --no-cache --virtual .deps icu-dev; \
+    docker-php-ext-configure intl; \
+    docker-php-ext-install intl; \
+    apk del .deps
+
+# ldap
+RUN set -eux; \
+    apk add --no-cache libldap; \
+    apk add --no-cache --virtual .deps openldap-dev; \
+    docker-php-ext-configure ldap; \
+    docker-php-ext-install ldap; \
+    apk del .deps
+
+# mysql
+RUN docker-php-ext-install pdo_mysql
+
+# postgres
+RUN set -eux; \
+    apk add --no-cache postgresql-libs; \
+    apk add --no-cache --virtual .deps postgresql-dev; \
+    docker-php-ext-install pdo_pgsql; \
+    apk del .deps
+
+# redis
+RUN set -eux; \
+    apk add --no-cache liblzf zstd-libs; \
+    apk add --no-cache --virtual .deps zstd-dev; \
+    apk add --no-cache --virtual .build-dependencies $PHPIZE_DEPS; \
+    pecl install igbinary; \
+    docker-php-ext-enable igbinary; \
+    pecl install --configureoptions 'enable-redis-igbinary="yes" enable-redis-lzf="yes" enable-redis-zstd="yes"' redis; \
+    docker-php-ext-enable redis; \
+    docker-php-source delete; \
+    apk del .build-dependencies; \
+    apk del .deps
+
+# sqlite
+RUN set -eux; \
+    apk add --no-cache sqlite-libs; \
+    apk add --no-cache --virtual .deps sqlite-dev; \
+    docker-php-ext-install pdo_sqlite; \
+    apk del .deps
+
+# tidy
+RUN set -eux; \
+    apk add --no-cache tidyhtml; \
+    apk add --no-cache --virtual .deps tidyhtml-dev; \
+    docker-php-ext-install tidy; \
+    apk del .deps
+
+# uuid
+RUN set -eux; \
+    apk add --no-cache libuuid; \
+    apk add --no-cache --virtual .deps util-linux-dev; \
+    apk add --no-cache --virtual .build-dependencies $PHPIZE_DEPS; \
+    pecl install uuid; \
+    docker-php-ext-enable uuid; \
+    docker-php-source delete; \
+    apk del .build-dependencies; \
+    apk del .deps
+
+# xxtea - Manually install php8 compatible version from https://github.com/xxtea/xxtea-pecl master branch
+RUN set -eux; \
+    apk add --no-cache --virtual .build-dependencies $PHPIZE_DEPS; \
+    wget -q https://github.com/xxtea/xxtea-pecl/tarball/3f5888a29045e12301254151737c5dab4523a1c1 -O xxtea.tar; \
+    echo '9cbfd9c27255767deb26ddedf69e738d401d88ac9762d82c8510f9768842ca18  xxtea.tar' | sha256sum -c -; \
+    tar -C /usr/src -xvf xxtea.tar; \
+    cd /usr/src/xxtea-xxtea-pecl-3f5888a; \
+    phpize; \
+    ./configure --with-php-config=/usr/local/bin/php-config --enable-xxtea=yes; \
+    make install; \
+    docker-php-ext-enable xxtea; \
+    cd -; \
+    rm -fv xxtea.tar; \
+    rm -rfv /usr/src/xxtea*; \
+    apk del .build-dependencies;
+
+# zip
+RUN set -eux; \
+    apk add --no-cache libzip; \
+    apk add --no-cache --virtual .deps libzip-dev; \
+    docker-php-ext-install zip; \
+    apk del .deps
 
 # Install snappymail
-WORKDIR /tmp
-COPY ${FILES_ZIP} .
-RUN mkdir /snappymail && \
-    unzip -q ${FILES_ZIP} -d /snappymail && \
-    find /snappymail -type d -exec chmod 755 {} \; && \
-    find /snappymail -type f -exec chmod 644 {} \; && \
-    rm -rf ${FILES_ZIP}
+# The 'www-data' user/group in alpine is 82:82. The 'nginx' user/group in alpine is 101:101, and is part of www-data group
+COPY --chown=www-data:www-data --from=builder /snappymail /snappymail
+# Use a custom snappymail data folder
+RUN mv -v /snappymail/data /var/lib/snappymail;
+# Setup configs
+COPY --chown=root:root .docker/release/files /
+RUN set -eux; \
+    chown www-data:www-data /snappymail/include.php; \
+    chmod 440 /snappymail/include.php; \
+    chmod +x /entrypoint.sh; \
+    # Disable the built-in php-fpm configs, since we're using our own config
+    mv -v /usr/local/etc/php-fpm.d/docker.conf /usr/local/etc/php-fpm.d/docker.conf.disabled; \
+    mv -v /usr/local/etc/php-fpm.d/www.conf /usr/local/etc/php-fpm.d/www.conf.disabled; \
+    mv -v /usr/local/etc/php-fpm.d/zz-docker.conf /usr/local/etc/php-fpm.d/zz-docker.conf.disabled;
 
-# Install other content
-COPY files /
-RUN chmod +x /entrypoint.sh && chmod +x /logrotate-loop.sh
-VOLUME /snappymail/data
+USER root
+WORKDIR /snappymail
+VOLUME /var/lib/snappymail
 EXPOSE 8888
+EXPOSE 9000
+ENTRYPOINT []
 CMD ["/entrypoint.sh"]

.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

.docker/release/files/etc/logrotate.d/snappymail

@@ -1,5 +0,0 @@
-/snappymail/data/_data_/_default_/logs/* {
-    size 10M
-    rotate 0
-    missingok
-}

.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;

.docker/release/files/logrotate-loop.sh

@@ -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}

.docker/release/files/snappymail/include.php

@@ -0,0 +1,3 @@
+<?php
+define('APP_DATA_FOLDER_PATH', '/var/lib/snappymail/');
+?>

.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
+autorestart=unexpected

.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

.docker/release/files/usr/local/include/application.ini

@@ -1,293 +0,0 @@
-; SnappyMail configuration file
-; Please don't add custom parameters here, those will be overwritten
-
-[webmail]
-; Text displayed as page title
-title = "SnappyMail Webmail"
-
-; Text displayed on startup
-loading_description = "SnappyMail"
-favicon_url = ""
-app_path = ""
-
-; Theme used by default
-theme = "Default"
-
-; Allow theme selection on settings screen
-allow_themes = On
-allow_user_background = Off
-
-; Language used by default
-language = "en"
-
-; Admin Panel interface language
-language_admin = "en"
-
-; Allow language selection on settings screen
-allow_languages_on_settings = On
-allow_additional_accounts = On
-allow_additional_identities = On
-
-; Number of messages displayed on page by default
-messages_per_page = 20
-
-; Mark message read after N seconds
-message_read_delay = 5
-
-; File size limit (MB) for file upload on compose screen
-; 0 for unlimited.
-attachment_size_limit = 2
-
-[interface]
-show_attachment_thumbnail = On
-
-[contacts]
-; Enable contacts
-enable = Off
-allow_sync = Off
-sync_interval = 20
-type = "sqlite"
-pdo_dsn = "host=127.0.0.1;port=3306;dbname=snappymail"
-pdo_user = "root"
-pdo_password = ""
-suggestions_limit = 30
-
-[security]
-; Enable CSRF protection (http://en.wikipedia.org/wiki/Cross-site_request_forgery)
-csrf_protection = On
-custom_server_signature = "SnappyMail"
-x_xss_protection_header = "1; mode=block"
-openpgp = Off
-
-; Login and password for web admin panel
-admin_login = "admin"
-admin_password = ""
-admin_totp = ""
-
-; Access settings
-allow_admin_panel = On
-hide_x_mailer_header = On
-admin_panel_host = ""
-admin_panel_key = "admin"
-content_security_policy = ""
-csp_report = Off
-encrypt_cipher = "aes-256-cbc-hmac-sha1"
-
-[admin_panel]
-allow_update = Off
-
-[ssl]
-; Require verification of SSL certificate used.
-verify_certificate = Off
-
-; Allow self-signed certificates. Requires verify_certificate.
-allow_self_signed = On
-
-; https://www.openssl.org/docs/man1.1.1/man3/SSL_CTX_set_security_level.html
-security_level = 1
-
-; Location of Certificate Authority file on local filesystem (/etc/ssl/certs/ca-certificates.crt)
-cafile = ""
-
-; capath must be a correctly hashed certificate directory. (/etc/ssl/certs/)
-capath = ""
-
-; Location of client certificate file (pem format with private key) on local filesystem
-client_cert = ""
-
-[capa]
-quota = 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
-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)
-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
-
-; Required for development purposes only.
-; Disabling this option is not recommended.
-hide_passwords = On
-time_zone = "UTC"
-
-; Log filename.
-; For security reasons, some characters are removed from filename.
-; Allows for pattern-based folder creation (see examples below).
-;
-; Patterns:
-;   {date:Y-m-d}  - Replaced by pattern-based date
-;                   Detailed info: http://www.php.net/manual/en/function.date.php
-;   {user:email}  - Replaced by user's email address
-;                   If user is not logged in, value is set to "unknown"
-;   {user:login}  - Replaced by user's login (the user part of an email)
-;                   If user is not logged in, value is set to "unknown"
-;   {user:domain} - Replaced by user's domain name (the domain part of an email)
-;                   If user is not logged in, value is set to "unknown"
-;   {user:uid}    - Replaced by user's UID regardless of account currently used
-;
-;   {user:ip}
-;   {request:ip}  - Replaced by user's IP address
-;
-; Others:
-;   {imap:login} {imap:host} {imap:port}
-;   {smtp:login} {smtp:host} {smtp:port}
-;
-; Examples:
-;   filename = "log-{date:Y-m-d}.txt"
-;   filename = "{date:Y-m-d}/{user:domain}/{user:email}_{user:uid}.log"
-;   filename = "{user:email}-{date:Y-m-d}.txt"
-;   filename = "syslog"
-filename = "log-{date:Y-m-d}.txt"
-
-; Enable auth logging in a separate file (for fail2ban)
-auth_logging = Off
-auth_logging_filename = "fail2ban/auth-{date:Y-m-d}.txt"
-auth_logging_format = "[{date:Y-m-d H:i:s}] Auth failed: ip={request:ip} user={imap:login} host={imap:host} port={imap:port}"
-
-; Enable auth logging to syslog for fail2ban
-auth_syslog = On
-
-[debug]
-; Special option required for development purposes
-enable = Off
-
-[cache]
-; The section controls caching of the entire application.
-;
-; Enables caching in the system
-enable = On
-
-; Additional caching key. If changed, cache is purged
-index = "v1"
-
-; Can be: files, APCU, memcache, redis (beta)
-fast_cache_driver = "files"
-
-; Additional caching key. If changed, fast cache is purged
-fast_cache_index = "v1"
-
-; Browser-level cache. If enabled, caching is maintainted without using files
-http = On
-
-; Browser-level cache time (seconds, Expires header)
-http_expires = 3600
-
-; Caching message UIDs when searching and sorting (threading)
-server_uids = On
-
-[imap]
-use_sort = On
-use_force_selection = Off
-use_thread = On
-use_move = Off
-use_expunge_all_on_delete = Off
-body_text_limit = 555000
-message_list_fast_simple_search = On
-message_list_count_limit_trigger = 0
-message_list_date_filter = 0
-message_list_permanent_filter = ""
-message_all_headers = Off
-large_thread_limit = 50
-folder_list_limit = 200
-show_login_alert = On
-use_list_status = On
-timeout = 300
-disable_metadata = Off
-
-[labs]
-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_app_debug_css = Off
-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
-folders_spec_limit = 50
-curl_proxy = ""
-curl_proxy_auth = ""
-force_https = Off
-custom_login_link = ""
-custom_logout_link = ""
-http_client_ip_check_proxy = Off
-fast_cache_memcache_host = "127.0.0.1"
-fast_cache_memcache_port = 11211
-fast_cache_redis_host = "127.0.0.1"
-fast_cache_redis_port = 6379
-use_local_proxy_for_external_images = On
-image_exif_auto_rotate = Off
-cookie_default_path = ""
-cookie_default_secure = Off
-check_new_messages = On
-replace_env_in_configuration = ""
-boundary_prefix = ""
-dev_email = ""
-dev_password = ""
-
-[version]
-current = "2.23.1"
-saved = "Fri, 30 Sep 2022 12:34:56 +0000"

.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"

.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

.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

.dockerignore

@@ -0,0 +1,2 @@
+/.git
+/node_modules

.eslintrc.js

@@ -3,7 +3,7 @@ module.exports = {
 //	extends: ['eslint:recommended', 'plugin:prettier/recommended'],
 	extends: ['eslint:recommended'],
 	parserOptions: {
-		ecmaVersion: 6,
+		ecmaVersion: 11,
 		sourceType: 'module'
 	},
 	env: {
@@ -35,10 +35,17 @@ module.exports = {
 		// vendors/bootstrap/bootstrap.native.js
 		'BSN': "readonly",
 		// Mailvelope
-		'mailvelope': "readonly"
+		'mailvelope': "readonly",
+		// Punycode
+		'IDN': "readonly",
+		// Turndown
+		'TurndownService': "readonly",
+		// Marked
+		'marked': "readonly"
 	},
 	// http://eslint.org/docs/rules/
 	rules: {
+		'no-cond-assign': 0,
 		// plugins
 		'no-mixed-spaces-and-tabs': 'off',
 		'max-len': [

.github/FUNDING.yml

@@ -1,2 +1,2 @@
-community_bridge: SnappyMail
+github: the-djmaze
 custom: ["https://www.paypal.me/thedjmaze", "https://snappymail.eu"]

.github/ISSUE_TEMPLATE/bug_report.md

@@ -28,9 +28,11 @@ If applicable, add screenshots to help explain your problem.
 - IMAP daemon: [e.g. courier, dovecot]
 - PHP version:
 - SnappyMail Version:
+- Mode: [e.g. standalone, nextcloud, cyberpanel, docker]
 
-**[Debug/logging information](https://github.com/the-djmaze/snappymail/wiki/FAQ#how-do-i-enable-logging)**
-Place them here (few lines) or as attachments (many lines)
+**Debug/logging information**
+[Read here how to log](https://github.com/the-djmaze/snappymail/wiki/FAQ#how-do-i-enable-logging)
+- [ ] I've placed them here (few lines) or as attachments (many lines)
 
 **Additional context**
 Add any other context about the problem here.

.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

.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

.gitignore

@@ -17,6 +17,7 @@
 /data
 /MULTIPLY
 /include.php
+/issues
 .idea/
 .env
 /test
@@ -24,6 +25,8 @@
 /vendors/knockout/spec
 /vendors/openpgp-5
 !/vendors/openpgp-5/dist
+/vendors/squire2
+!/vendors/squire2/dist
 /vendors/vanillaqr.js/
 /integrations/nextcloud/rainloop
 /integrations/owncloud/rainloop

.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

.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>
@@ -26,7 +34,6 @@
 #	Header set Strict-Transport-Security "max-age=31536000"
 	Header set imagetoolbar "no"
 #	Header set X-Content-Type-Options "nosniff"
-#	Header set X-Frame-Options "DENY"
 #	Header set X-XSS-Protection "1; mode=block"
 	Header set Service-Worker-Allowed "/"
 

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**
 

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,7 +38,7 @@ 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) 2020 - 2024 SnappyMail
 Copyright (c) 2013 - 2022 RainLoop
 
 ## Modifications
@@ -45,7 +49,7 @@ This fork of RainLoop has the following changes:
 * Admin uses password_hash/password_verify
 * Auth failed attempts written to syslog
 * Added Fail2ban instructions
-* ES2018
+* ES2020
 * PHP 7.4+ required
 * PHP mbstring extension required
 * PHP replaced pclZip with PharData and ZipArchive
@@ -62,7 +66,7 @@ This fork of RainLoop has the following changes:
 * CRLF => LF line endings
 * Embed boot.js and boot.css into index.html
 * Removal of old JavaScript code (things are native these days)
-* Added modified [Squire](https://github.com/neilj/Squire) HTML editor as replacement for CKEditor
+* 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
@@ -79,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
 
@@ -141,28 +140,28 @@ RainLoop 1.17 vs SnappyMail
 
 |js/*           	|RainLoop 	|Snappy   	|
 |---------------	|--------:	|--------:	|
-|admin.js        	|2.170.153	|   83.917	|
-|app.js          	|4.207.787	|  412.197	|
-|boot.js         	|  868.735	|    2.351	|
-|libs.js         	|  658.812	|  193.682	|
-|sieve.js         	|        0	|   86.018	|
+|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.240.095	|  778.450	|
+|TOTAL           	|8.240.095	|  861.962	|
 
 |js/min/*       	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|------:	|--------:	|--------:	|
-|admin.min.js    	|  256.831	|   41.827	| 73.606	| 13.858	| 60.877  	| 12.432	|
-|app.min.js      	|  515.367	|  190.374	|139.456	| 63.219	|110.485  	| 54.234	|
-|boot.min.js     	|   84.659	|    1.474	| 26.998	|    907	| 23.643  	|    733	|
-|libs.min.js     	|  584.772	|   92.082	|180.901	| 34.144	|155.182  	| 30.670	|
-|sieve.min.js     	|        0	|   41.909	|      0	| 10.476	|      0  	|  9.461	|
+|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	|  283.930	|358.761	| 98.270	|299.485  	| 85.637	|
-|TOTAL user+sieve	|1.217.635	|  325.839	|358.761	|108.746	|299.485  	| 95.098	|
-|TOTAL admin     	|  959.099	|  135.383	|292.911	| 48.909	|249.877  	| 43.835	|
+|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
 
@@ -189,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.331	| 82.348	| 46.946	| 17.074	| 14.652	|
-|app.min.css 	| 274.947	| 66.376	| 39.647	| 15.048	| 13.200	|
+|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    	|       	| 30.277	|       	|  6.901	|  5.999	|
-|admin.min.css	|       	| 24.524	|       	|  6.238	|  5.503	|
+|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
@@ -208,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.988	|102.388	| 167.371	| 84.241  	|  137.413	|
+|openpgp.min.js 	|  330.742	|  546.165	|102.388	| 169.207	| 84.241  	|  138.688	|
 |openpgp.worker 	|    1.499	|         	|    824	|        	|    695 	|        	|
 
 
@@ -218,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	|
 |--------	|-------:	|-------:	|------:	|--------:	|
@@ -226,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.

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.

_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);

assets/.htaccess

@@ -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|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>

build/nextcloud.php

@@ -1,46 +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);
-//		$newFile = str_replace("'snappymail/v/'.", '', $newFile);
-		$nc_tar->addFile($file, "snappymail/app/{$newFile}");
+		$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');
+$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 ~/.nextcloud/certificates/snappymail.key {$nc_destination} | openssl base64");
+$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";

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";

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;
+    }
+}

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);
+    }
+}

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>';
+    }
+}

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;
+    }
+}

build/phpseclib/openssl.cnf

@@ -0,0 +1,6 @@
+# minimalist openssl.cnf file for use with phpseclib
+
+HOME			= .
+RANDFILE		= $ENV::HOME/.rnd
+
+[ v3_ca ]

build/plugins.php

@@ -1,5 +1,4 @@
 <?php
-define('ROOT_DIR', dirname(__DIR__));
 define('PLUGINS_DEST_DIR', __DIR__ . '/dist/releases/plugins');
 
 is_dir(PLUGINS_DEST_DIR) || mkdir(PLUGINS_DEST_DIR, 0777, true);
@@ -29,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") && !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) {
@@ -71,6 +106,7 @@ foreach (glob(ROOT_DIR . '/plugins/*', GLOB_NOSORT | GLOB_ONLYDIR) as $dir) {
 			$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);
@@ -80,6 +116,7 @@ foreach (glob(ROOT_DIR . '/plugins/*', GLOB_NOSORT | GLOB_ONLYDIR) as $dir) {
 				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')));

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 " . ROOT_DIR . "/.docker/release/ --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);
+	}
+}

dev/App/Abstract.js

@@ -3,8 +3,10 @@ import ko from 'ko';
 import { logoutLink } from 'Common/Links';
 import { i18nToNodes, initOnStartOrLangChange } from 'Common/Translator';
 
+import { arePopupsVisible } from 'Knoin/Knoin';
+
 import { LanguageStore } from 'Stores/Language';
-import { ThemeStore } from 'Stores/Theme';
+import { initThemes } from 'Stores/Theme';
 
 import { SelectComponent } from 'Component/Select';
 import { CheckboxComponent } from 'Component/Checkbox';
@@ -18,6 +20,7 @@ export class AbstractApp {
 	}
 
 	logoutReload(url) {
+		arePopupsVisible(false);
 		url = url || logoutLink();
 		if (location.href !== url) {
 			setTimeout(() => location.href = url, 100);
@@ -46,7 +49,7 @@ export class AbstractApp {
 		initOnStartOrLangChange();
 
 		LanguageStore.populate();
-		ThemeStore.populate();
+		initThemes();
 
 		this.start();
 	}

dev/App/Admin.js

@@ -1,7 +1,7 @@
 import 'External/ko';
 
-import { Settings, SettingsGet } from 'Common/Globals';
-import { ThemeStore } from 'Stores/Theme';
+import { SettingsGet, SettingsAdmin } from 'Common/Globals';
+import { initThemes } from 'Stores/Theme';
 
 import Remote from 'Remote/Admin/Fetch';
 
@@ -11,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);
@@ -18,19 +20,33 @@ export class AdminApp extends AbstractApp {
 	}
 
 	refresh() {
-		ThemeStore.populate();
+		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
+		]);
+	});
+};

dev/App/User.js

@@ -1,8 +1,8 @@
 import 'External/User/ko';
 
 import { SMAudio } from 'Common/Audio';
-import { isArray, pString } from 'Common/Utils';
-import { mailToHelper, setLayoutResizer, dropdownsDetectVisibility } from 'Common/UtilsUser';
+import { arrayLength } from 'Common/Utils';
+import { mailToHelper, setLayoutResizer, dropdownsDetectVisibility, loadAccountsAndIdentities } from 'Common/UtilsUser';
 
 import {
 	FolderType,
@@ -27,25 +27,22 @@ import {
 	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, changeTheme } 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,9 +58,7 @@ import { AskPopupView } from 'View/Popup/Ask';
 import {
 	folderInformation,
 	folderInformationMultiply,
-	refreshFoldersInterval,
-	messagesMoveHelper,
-	messagesDeleteHelper
+	setRefreshFoldersInterval
 } from 'Common/Folders';
 import { loadFolders } from 'Model/FolderCollection';
 
@@ -79,7 +74,7 @@ export class AppUser extends AbstractApp {
 			(currentTime > (lastTime + interval + 1000))
 			&& Remote.request('Version',
 					iError => (100 < iError) && location.reload(),
-					{ Version: Settings.app('version') }
+					{ version: Settings.app('version') }
 				);
 			lastTime = currentTime;
 		}, interval);
@@ -90,6 +85,11 @@ export class AppUser extends AbstractApp {
 		addEventListener('click', dropdownsDetectVisibility);
 
 		this.folderList = FolderUserStore.folderList;
+		this.messageList = MessagelistUserStore;
+
+		this.ask = AskPopupView;
+
+		this.loadAccountsAndIdentities = loadAccountsAndIdentities;
 	}
 
 	/**
@@ -114,7 +114,7 @@ export class AppUser extends AbstractApp {
 			case FolderType.Trash:
 				oMoveFolder = getFolderFromCacheList(FolderUserStore.trashFolder());
 				nSetSystemFoldersNotification = iFolderType;
-				bDelete = bDelete || UNUSED_OPTION_VALUE === FolderUserStore.trashFolder()
+				bDelete = bDelete/* || UNUSED_OPTION_VALUE === FolderUserStore.trashFolder()*/
 					|| sFromFolderFullName === FolderUserStore.spamFolder()
 					|| sFromFolderFullName === FolderUserStore.trashFolder();
 				break;
@@ -126,58 +126,20 @@ export class AppUser extends AbstractApp {
 			// no default
 		}
 
-		if (!oMoveFolder && !bDelete) {
-			showScreenPopup(FolderSystemPopupView, [nSetSystemFoldersNotification]);
-		} else if (bDelete) {
+		if (bDelete) {
 			showScreenPopup(AskPopupView, [
 				i18n('POPUPS_ASK/DESC_WANT_DELETE_MESSAGES'),
 				() => {
-					messagesDeleteHelper(sFromFolderFullName, oUids);
-					MessagelistUserStore.removeMessagesFromList(sFromFolderFullName, oUids);
+					MessagelistUserStore.moveMessages(sFromFolderFullName, oUids);
 				}
 			]);
 		} else if (oMoveFolder) {
-			messagesMoveHelper(sFromFolderFullName, oMoveFolder.fullName, oUids);
-			MessagelistUserStore.removeMessagesFromList(sFromFolderFullName, oUids, 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) {
-				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 => {
-						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 = []
@@ -187,25 +149,26 @@ export class AppUser extends AbstractApp {
 	}
 
 	logout() {
-		Remote.request('Logout', () => rl.logoutReload(Settings.app('customLogoutLink')));
+		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() || (ThemeStore.isMobile() && MessageUserStore.message())) {
+			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() {
-		ThemeStore.populate();
-		LanguageStore.language(SettingsGet('Language'));
-		changeTheme(SettingsGet('Theme'));
+		initThemes();
+		LanguageStore.language(SettingsGet('language'));
 		this.start();
 	}
 
@@ -221,25 +184,17 @@ export class AppUser extends AbstractApp {
 			SettingsUserStore.init();
 			ContactUserStore.init();
 
-			loadFolders(value => {
+			loadFolders((success, error) => {
 				try {
-					if (value) {
+					if (success) {
 						startScreens([
 							MailBoxUserScreen,
 							SettingsUserScreen
 						]);
 
-						setInterval(() => {
-							const cF = FolderUserStore.currentFolderFullName(),
-								iF = getFolderInboxName();
-							folderInformation(iF);
-							iF === cF || folderInformation(cF);
-							folderInformationMultiply();
-						}, refreshFoldersInterval);
+						setRefreshFoldersInterval(SettingsGet('CheckMailInterval'));
 
-						ContactUserStore.init();
-
-						this.accountsAndIdentities();
+						loadAccountsAndIdentities();
 
 						setTimeout(() => {
 							const cF = FolderUserStore.currentFolderFullName();
@@ -256,38 +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
-						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]);
 		}
@@ -295,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();
+});

dev/Common/Audio.js

@@ -116,6 +116,7 @@ export const SMAudio = new class {
 			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'));

dev/Common/Cache.js

@@ -1,9 +1,5 @@
-import { MessageSetAction } from 'Common/EnumsUser';
-import { isArray } from 'Common/Utils';
-
-let FOLDERS_CACHE = {},
-	FOLDERS_NAME_CACHE = {},
-	MESSAGE_FLAGS_CACHE = {},
+let FOLDERS_CACHE = new Map,
+	FOLDERS_HASH_MAP = new Map,
 	inboxFolderName = 'INBOX';
 
 export const
@@ -11,18 +7,10 @@ export const
 	 * @returns {void}
 	 */
 	clearCache = () => {
-		FOLDERS_CACHE = {};
-		FOLDERS_NAME_CACHE = {};
-		MESSAGE_FLAGS_CACHE = {};
+		FOLDERS_CACHE.clear();
+		FOLDERS_HASH_MAP.clear();
 	},
 
-	/**
-	 * @param {string} folderFullName
-	 * @param {string} uid
-	 * @returns {string}
-	 */
-	getMessageKey = (folderFullName, uid) => folderFullName + '#' + uid,
-
 	/**
 	 * @returns {string}
 	 */
@@ -34,143 +22,35 @@ export const
 	setFolderInboxName = name => inboxFolderName = name,
 
 	/**
-	 * @param {string} folderHash
+	 * @param {string} fullNameHash
 	 * @returns {string}
 	 */
-	getFolderFullName = folderHash => (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
-	 * @param {string} folderHash
+	 * @param {string} folderETag
 	 */
-	setFolderHash = (folderFullName, folderHash) =>
-		FOLDERS_CACHE[folderFullName] && (FOLDERS_CACHE[folderFullName].hash = folderHash),
+	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]?.[uid]?.includes(flag);
-	}
-
-	/**
-	 * @param {string} folderFullName
-	 * @param {string} uid
-	 * @returns {?Array}
-	 */
-	static getFor(folderFullName, uid) {
-		return 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();
-
-			isArray(flags) && message.flags(flags);
-
-			if (thread.length) {
-				message.hasUnseenSubMessage(!!thread.find(iSubUid =>
-					(uid !== iSubUid) && !this.hasFlag(message.folder, iSubUid, '\\seen')
-				));
-				message.hasFlaggedSubMessage(!!thread.find(iSubUid =>
-					(uid !== iSubUid) && this.hasFlag(message.folder, iSubUid, '\\flagged')
-				));
-			}
-		}
-	}
-
-	/**
-	 * @param {(MessageModel|null)} message
-	 */
-	static store(message) {
-		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);

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}
@@ -39,7 +37,7 @@ SaveSettingStatus = {
 /**
  * @enum {number}
  */
-Notification = {
+Notifications = {
 	RequestError: 1,
 	RequestAborted: 2,
 	RequestTimeout: 3,
@@ -52,6 +50,7 @@ Notification = {
 	ConnectionError: 104,
 	DomainNotAllowed: 109,
 	AccountNotAllowed: 110,
+	CryptKeyError: 111,
 
 	ContactsSyncError: 140,
 
@@ -97,7 +96,6 @@ Notification = {
 	JsonParse: 952,
 //	JsonTimeout: 953,
 
-	UnknownNotification: 998,
 	UnknownError: 999,
 
 	// Admin

dev/Common/EnumsUser.js

@@ -25,12 +25,12 @@ export const FolderType = {
 	FILES    : 25;
 	JOURNAL  : 26;
 */
-};
+},
 
 /**
  * @enum {string}
  */
-export const FolderMetadataKeys = {
+FolderMetadataKeys = {
 	// RFC 5464
 	Comment: '/private/comment',
 	CommentShared: '/shared/comment',
@@ -39,12 +39,12 @@ export const FolderMetadataKeys = {
 	// Kolab
 	KolabFolderType: '/private/vendor/kolab/folder-type',
 	KolabFolderTypeShared: '/shared/vendor/kolab/folder-type'
-};
+},
 
 /**
  * @enum {string}
  */
-export const ComposeType = {
+ComposeType = {
 	Empty: 0,
 	Reply: 1,
 	ReplyAll: 2,
@@ -52,51 +52,34 @@ export const ComposeType = {
 	ForwardAsAttachment: 4,
 	Draft: 5,
 	EditAsNew: 6
-};
+},
 
 /**
  * @enum {number}
  */
-export const
-	ClientSideKeyNameExpandedFolders = 3,
-	ClientSideKeyNameFolderListSize = 4,
-	ClientSideKeyNameMessageListSize = 5,
-	ClientSideKeyNameLastSignMe = 7,
-	ClientSideKeyNameMessageHeaderFullInfo = 9,
-	ClientSideKeyNameMessageAttachmentControls = 10;
+ClientSideKeyNameExpandedFolders = 3,
+ClientSideKeyNameFolderListSize = 4,
+ClientSideKeyNameMessageListSize = 5,
+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'
-};
-
-/**
- * @enum {number}
- */
-export const Layout = {
-	NoPreview: 0,
-	SidePreview: 1,
-	BottomPreview: 2
-};
+//LayoutNoView = 0,
+LayoutSideView = 1,
+LayoutBottomView = 2
+;

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',
@@ -28,6 +30,8 @@ const
 		p7c: app+'pkcs7-mime',
 		p7m: app+'pkcs7-mime',
 		p7s: app+'pkcs7-signature',
+		p12: app+'pkcs12',
+		pfx: app+'x-pkcs12',
 		torrent: app+'x-bittorrent',
 
 		// scripts
@@ -116,7 +120,8 @@ export const FileType = {
 	Spreadsheet: 'spreadsheet',
 	Presentation: 'presentation',
 	Certificate: 'certificate',
-	Archive: 'archive'
+	Archive: 'archive',
+	Calendar: 'calendar'
 };
 
 export const FileInfo = {
@@ -133,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))
@@ -161,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]) {
@@ -170,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)$/;
 
@@ -187,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;
@@ -199,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')
@@ -240,6 +247,7 @@ export const FileInfo = {
 			case FileType.Certificate:
 			case FileType.Spreadsheet:
 			case FileType.Presentation:
+			case FileType.Calendar:
 				return result + '-' + fileType;
 		}
 		return result;
@@ -266,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];
 	}
 

dev/Common/Folders.js

@@ -1,24 +1,35 @@
-import { isArray, arrayLength } from 'Common/Utils';
-import {
-	MessageFlagsCache,
-	setFolderHash,
-	getFolderInboxName,
-	getFolderFromCacheList
-} 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 { Settings,  } from 'Common/Globals';
-import { serverRequest } from 'Common/Links';
 
 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,37 +38,6 @@ sortFolders = folders => {
 	}
 },
 
-/**
- * @param {?Function} fCallback
- * @param {string} folder
- * @param {Array=} list = []
- */
-fetchFolderInformation = (fCallback, folder, list = []) => {
-	let fetch = !arrayLength(list);
-	const uids = [],
-		folderFromCache = getFolderFromCacheList(folder);
-
-	if (!fetch) {
-		list.forEach(messageListItem => {
-			MessageFlagsCache.getFor(folder, messageListItem.uid) || uids.push(messageListItem.uid);
-			messageListItem.threads.forEach(uid => {
-				MessageFlagsCache.getFor(folder, uid) || uids.push(uid);
-			});
-		});
-		fetch = uids.length;
-	}
-
-	if (fetch) {
-		Remote.request('FolderInformation', fCallback, {
-			Folder: folder,
-			FlagsUids: uids,
-			UidNext: folderFromCache?.uidNext || 0 // Used to check for new messages
-		});
-	} else if (SettingsUserStore.useThreads()) {
-		MessagelistUserStore.reloadFlagsAndCachedMessage();
-	}
-},
-
 /**
  * @param {Array=} aDisabled
  * @param {Array=} aHeaderLines
@@ -70,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 => {
@@ -89,10 +68,7 @@ folderListOptionsBuilder = (
 							sDeepPrefix.repeat(oItem.deep) +
 							fRenameCallback(oItem),
 						system: false,
-						disabled: !bNoSelectSelectable && (
-							!oItem.selectable() ||
-							aDisabled.includes(oItem.fullName) ||
-							fDisableCallback(oItem))
+						disabled: isDisabled(oItem)
 					});
 				}
 				foldersWalk(oItem.subFolders());
@@ -113,61 +89,64 @@ 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()) {
-		fetchFolderInformation(
-			(iError, data) => {
+		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.Folder);
+						folderFromCache = getFolderFromCacheList(result.name);
 					if (folderFromCache) {
-						const oldHash = folderFromCache.hash,
+						const oldHash = folderFromCache.etag,
 							unreadCountChange = (folderFromCache.unreadEmails() !== result.unreadEmails);
 
-//							folderFromCache.revivePropertiesFromJson(result);
+//						folderFromCache.revivePropertiesFromJson(result);
 						folderFromCache.expires = Date.now();
-						folderFromCache.uidNext = result.UidNext;
-						folderFromCache.hash = result.Hash;
+						folderFromCache.uidNext = result.uidNext;
+						folderFromCache.etag = result.etag;
 						folderFromCache.totalEmails(result.totalEmails);
 						folderFromCache.unreadEmails(result.unreadEmails);
 
-						unreadCountChange && MessageFlagsCache.clearFolder(folderFromCache.fullName);
+						MessagelistUserStore.notifyNewMessages(folderFromCache.fullName, result.newMessages);
 
-						if (result.MessagesFlags.length) {
-							result.MessagesFlags.forEach(message =>
-								MessageFlagsCache.setFor(folderFromCache.fullName, message.Uid.toString(), message.Flags)
-							);
-
-							MessagelistUserStore.reloadFlagsAndCachedMessage();
-						}
-
-						MessagelistUserStore.notifyNewMessages(folderFromCache.fullName, result.NewMessages);
-
-						if (!oldHash || unreadCountChange || result.Hash !== oldHash) {
+						if (!oldHash || unreadCountChange || result.etag !== oldHash) {
 							if (folderFromCache.fullName === FolderUserStore.currentFolderFullName()) {
 								MessagelistUserStore.reload();
+/*
 							} else if (getFolderInboxName() === folderFromCache.fullName) {
-								Remote.messageList(null, {Folder: getFolderInboxName()}, true);
+//								Remote.messageList(null, {folder: getFolderFromCacheList(getFolderInboxName())}, true);
+								Remote.messageList(null, {folder: getFolderInboxName()}, true);
+*/
 							}
 						}
 					}
 				}
-			},
-			folder,
-			list
-		);
+			}, {
+				folder: folder,
+				flagsUids: uids,
+				uidNext: getFolderFromCacheList(folder)?.uidNext || 0 // Used to check for new messages
+			});
+		}
 	}
 },
 
@@ -181,21 +160,18 @@ folderInformationMultiply = (boot = false) => {
 			if (!iError && arrayLength(oData.Result)) {
 				const utc = Date.now();
 				oData.Result.forEach(item => {
-					const folder = getFolderFromCacheList(item.Folder);
-
+					const folder = getFolderFromCacheList(item.name);
 					if (folder) {
-						const oldHash = folder.hash,
+						const oldHash = folder.etag,
 							unreadCountChange = folder.unreadEmails() !== item.unreadEmails;
 
 //						folder.revivePropertiesFromJson(item);
 						folder.expires = utc;
-						folder.hash = item.Hash;
+						folder.etag = item.etag;
 						folder.totalEmails(item.totalEmails);
 						folder.unreadEmails(item.unreadEmails);
 
-						unreadCountChange && MessageFlagsCache.clearFolder(folder.fullName);
-
-						if (!oldHash || item.Hash !== oldHash) {
+						if (!oldHash || item.etag !== oldHash) {
 							if (folder.fullName === FolderUserStore.currentFolderFullName()) {
 								MessagelistUserStore.reload();
 							}
@@ -210,104 +186,26 @@ folderInformationMultiply = (boot = false) => {
 				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]);
-		} 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.abort('MessageList').request('MessageMove',
-		moveOrDeleteResponseHelper,
-		{
-			FromFolder: fromFolderFullName,
-			ToFolder: toFolderFullName,
-			Uids: [...uidsForMove].join(','),
-			MarkAsRead: (isSpam || FolderUserStore.trashFolder() === toFolderFullName) ? 1 : 0,
-			Learning: isSpam ? 'SPAM' : isHam ? 'HAM' : ''
-		}
-	);
-},
-
-messagesDeleteHelper = (sFromFolderFullName, aUidForRemove) => {
-	Remote.abort('MessageList').request('MessageDelete',
-		moveOrDeleteResponseHelper,
-		{
-			Folder: sFromFolderFullName,
-			Uids: [...aUidForRemove].join(',')
-		}
-	);
-},
-
-/**
- * @param {string} sFromFolderFullName
- * @param {Set} oUids
- * @param {string} sToFolderFullName
- * @param {boolean=} bCopy = false
- */
-moveMessagesToFolder = (sFromFolderFullName, oUids, sToFolderFullName, bCopy) => {
-	if (sFromFolderFullName !== sToFolderFullName && oUids?.size) {
-		const oFromFolder = getFolderFromCacheList(sFromFolderFullName),
-			oToFolder = getFolderFromCacheList(sToFolderFullName);
-
-		if (oFromFolder && oToFolder) {
-			bCopy
-				? Remote.request('MessageCopy', null, {
-						FromFolder: oFromFolder.fullName,
-						ToFolder: oToFolder.fullName,
-						Uids: [...oUids].join(',')
-					})
-				: messagesMoveHelper(oFromFolder.fullName, oToFolder.fullName, oUids);
-
-			MessagelistUserStore.removeMessagesFromList(oFromFolder.fullName, oUids, oToFolder.fullName, bCopy);
-			return true;
-		}
-	}
-
-	return false;
-},
-
 dropFilesInFolder = (sFolderFullName, files) => {
-	let count = 0,
-		fn = () => 0 == --count
-			&& FolderUserStore.currentFolderFullName() == sFolderFullName
-			&& MessagelistUserStore.reload(true, true);
+	let count = files.length;
 	for (const file of files) {
-		if ('message/rfc822' === file.type) {
-			++count;
+		if (RFC822 === file.type) {
 			let data = new FormData;
-			data.append('Folder', sFolderFullName);
-			data.append('AppendFile', file);
-			data.XToken = Settings.app('token');
-			fetch(serverRequest('Append'), {
-				method: 'POST',
-				mode: 'same-origin',
-				cache: 'no-cache',
-				redirect: 'error',
-				referrerPolicy: 'no-referrer',
-				credentials: 'same-origin',
-				body: data
-			})
-			.then(fn)
-			.catch(fn);
+			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 {
+			--count;
 		}
 	}
 };

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());

dev/Common/Globals.js

@@ -11,8 +11,11 @@ export const
 
 	elementById = id => doc.getElementById(id),
 
+	appEl = elementById('rl-app'),
+
 	Settings = rl.settings,
 	SettingsGet = Settings.get,
+	SettingsAdmin = name => (SettingsGet('Admin') || {})[name],
 	SettingsCapa = name => name && !!(SettingsGet('Capa') || {})[name],
 
 	dropdowns = [],
@@ -31,6 +34,11 @@ export const
 		new CustomEvent(name, {detail:detail, cancelable: !!cancelable})
 	),
 
+	stopEvent = event => {
+		event.preventDefault();
+		event.stopPropagation();
+	},
+
 	formFieldFocused = () => doc.activeElement?.matches('input,textarea'),
 
 	addShortcut = (...args) => shortcuts.add(...args),

dev/Common/Html.js

@@ -1,9 +1,12 @@
 import { createElement } from 'Common/Globals';
-import { forEachObjectEntry, pInt } from 'Common/Utils';
+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 = {
@@ -14,13 +17,52 @@ 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]),
 
-	url = /(^|\s|\n|\/?>)(https?:\/\/[-A-Z0-9+&#/%?=()~_|!:,.;]*[-A-Z0-9+&#/%=~()_|])/gi,
+	urlRegExp = /https?:\/\/[^\p{C}\p{Z}]+[^\p{C}\p{Z}.]/gu,
 	// 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,
+	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 = /(^|\s|\n|\/?>)(tel:(\+[0-9().-]+|[0-9*#().-]+(;phone-context=\+[0-9+().-]+)?))/g,
+	tel = /(tel:(\+[0-9().-]+|[0-9*#().-]+(;phone-context=\+[0-9+().-]+)?))/g,
 
 	// Strip tracking
 	/** TODO: implement other url strippers like from
@@ -31,17 +73,21 @@ const
 	 * 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_)/i,
+	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) => decodeURIComponent(m[2]))
+				.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])
@@ -73,6 +119,97 @@ const
 			});
 		}
 		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
@@ -88,28 +225,32 @@ export const
 	 * @param {string} text
 	 * @returns {string}
 	 */
-	cleanHtml = (html, oAttachments) => {
+	cleanHtml = (html, oAttachments, msgId) => {
+		let aColor;
 		const
 			debug = false, // Config()->Get('debug', 'enable', false);
 			detectHiddenImages = true, // !!SettingsGet('try_to_detect_hidden_images'),
 
+			bqLevel = parseInt(SettingsUserStore.maxBlockquotesLevel()),
+			minFontSize = parseInt(SettingsUserStore.minFontSize()),
+
 			result = {
-				hasExternals: false
+				hasExternals: false,
+				tracking: false,
+				linkedData: []
 			},
 
-			findAttachmentByCid = cid => oAttachments.findByCid(cid),
-			findLocationByCid = cid => {
-				const attachment = findAttachmentByCid(cid);
+			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 || (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',
@@ -117,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',
@@ -144,42 +294,112 @@ 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'
+				// 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(/<!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[^>]*)?>/gi, '<$1div class="mail-body"$2>')
-			.replace(/<\/?(html|head)[^>]*>/gi, '')
+//			.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)
@@ -189,36 +409,31 @@ export const
 				oElement.remove();
 				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);
 					}
@@ -230,25 +445,21 @@ export const
 //			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
-					if (hasAttribute('width')) {
-						value = getAttribute('width');
-						oStyle.width = value.includes('%') ? value : value + 'px';
-						delAttribute('width');
-					}
-					value = oStyle.removeProperty('width');
-					if (value) {
+					value = oStyle.width;
+					if (100 < parseInt(value,10) && !oStyle.maxWidth) {
 						oStyle.maxWidth = value;
 						oStyle.width = '100%';
 					}
 					// Make height responsive
-					if (hasAttribute('height')) {
-						value = getAttribute('height');
-						oStyle.height = value.includes('%') ? value : value + 'px';
-						delAttribute('height');
-					}
 					value = oStyle.removeProperty('height');
-					if (value) {
+					if (value && !oStyle.maxHeight) {
 						oStyle.maxHeight = value;
 					}
 				}
@@ -257,18 +468,23 @@ export const
 			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('tabindex', '-1');
+				aColor && !oElement.style.color && (oElement.style.color = aColor);
 			}
 
 //			if (['CENTER','FORM'].includes(name)) {
-			if ('FORM' === name || 'O:P' === name || (nonEmptyTags.includes(name) && ('' == oElement.textContent.trim()))) {
+			if (nonEmptyTags.includes(name) && ('' == oElement.textContent.trim())) {
 				('A' !== name || !oElement.querySelector('IMG')) && replaceWithChildren(oElement);
 				return;
 			}
@@ -281,81 +497,85 @@ export const
 			*/
 
 			let skipStyle = false;
-			if (hasAttribute('src')) {
-				value = stripTracking(getAttribute('src'));
-				delAttribute('src');
-
-				if ('IMG' === name) {
-					oElement.loading = 'lazy';
-					let attachment;
-					if (value.startsWith('cid:'))
-					{
-						value = value.slice(4);
-						setAttribute('data-x-src-cid', value);
-						attachment = findAttachmentByCid(value);
-						if (attachment?.download) {
-							oElement.src = attachment.linkPreview();
-							oElement.title += ' ('+attachment.fileName+')';
-							attachment.isInline(true);
-							attachment.isLinked(true);
+			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 ((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 if (detectHiddenImages
-						&& ((oStyle.maxHeight && 3 > pInt(oStyle.maxHeight)) // TODO: issue with 'in'
-							|| (oStyle.maxWidth && 3 > pInt(oStyle.maxWidth)) // TODO: issue with 'in'
-							|| [
-								'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);
-					}
-					else if (httpre.test(value))
-					{
-						setAttribute('data-x-src', value);
-						result.hasExternals = true;
-						oElement.alt || (oElement.alt = value.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) {
@@ -407,8 +627,10 @@ export const
 					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
+				if (minFontSize > pInt(oStyle.fontSize)) {
+					oStyle.fontSize = minFontSize + "px";
+//					oStyle.removeProperty('font-size');
 				}
 
 				// Removes background and color
@@ -420,8 +642,7 @@ export const
 					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) {
@@ -429,8 +650,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;
 	},
 
@@ -439,9 +662,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'))) {
@@ -459,6 +685,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, ' ');
 
@@ -469,10 +697,12 @@ 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');
 
+		forEach('style', node => node.remove());
+
 		// lines
 		forEach('hr', node => node.replaceWith(`\n\n${hr}\n\n`));
 
@@ -509,7 +739,9 @@ export const
 		forEach('a', a => {
 			let txt = a.textContent, href = a.href;
 			return a.replaceWith(
-				txt.trim() == href || href.includes('mailto:') ? txt : txt + ' ' + href + ' '
+				txt.replace(/[\s()-]+/g, '').includes(href.replace(/^[a-z]:/, '').replace(/[\s()-]+/g, ''))
+				? txt
+				: txt + ' ' + href + ' '
 			);
 		});
 
@@ -519,16 +751,21 @@ export const
 		forEach('i,em', i => i.replaceWith(`*${i.textContent}*`));
 
 		// Convert line-breaks
-		tpl.innerHTML = tpl.innerHTML
+		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'));
 
 		// Blockquotes must be last
-		blockquotes(tpl.content);
+		blockquotes(tmpl.content);
 
-		return (tpl.content.textContent || '').trim();
+		return (tmpl.content.textContent || '').trim();
+	},
+
+	htmlToMarkdown = html => {
+		tmpl.innerHTML = html;
+		return turndown.turndown(tmpl.content);
 	},
 
 	/**
@@ -539,7 +776,9 @@ export const
 	plainToHtml = plain => {
 		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,
@@ -580,200 +819,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(url, (...m) => {
-				m[2] = stripTracking(m[2]);
-				return `${m[1]}<a href="${m[2]}" target="_blank">${m[2]}</a>`;
+			.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, '$1<a href="$2">$2</a>')
+			.replace(tel, '<a href="$1">$1</a>')
 			.replace(/~~~blockquote~~~\s*/g, '<blockquote>')
 			.replace(/\s*~~~\/blockquote~~~/g, '</blockquote>')
 			.replace(/\n/g, '<br>');
-	},
-
-	WYSIWYGS = ko.observableArray();
-
-WYSIWYGS.push(['Squire', (owner, container, onReady)=>{
-	let squire = new SquireUI(container);
-	setTimeout(()=>onReady(squire), 1);
-/*
-	squire.on('blur', () => owner.blurTrigger());
-	squire.on('focus', () => clearTimeout(owner.blurTimer));
-	squire.on('mode', () => {
-		owner.blurTrigger();
-		owner.onModeChange?.(!owner.isPlain());
-	});
-*/
-}]);
-
-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, onBlur = null, onReady = null, onModeChange = null) {
-		this.blurTimer = 0;
-
-		this.onBlur = onBlur;
-		this.onModeChange = onModeChange;
-
-		if (element) {
-			onReady = onReady ? [onReady] : [];
-			this.onReady = fn => onReady.push(fn);
-			// TODO: make 'which' user configurable
-//			const which = 'CKEditor4',
-//				wysiwyg = WYSIWYGS.find(item => which == item[0]) || WYSIWYGS.find(item => 'Squire' == item[0]);
-			const wysiwyg = WYSIWYGS.find(item => 'Squire' == item[0]);
-			wysiwyg[1](this, element, editor => {
-				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());
-			});
-		}
-	}
-
-	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() && 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) {
-		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.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?.focusManager.hasFocus;
-		} catch (e) {
-			return false;
-		}
-	}
-
-	blur() {
-		this.onReady(() => this.editor.focusManager.blur(true));
-	}
-
-	clear() {
-		this.onReady(() => this.isPlain() ? this.setPlain('') : this.setHtml(''));
-	}
-}
+		blockquoteSwitcher();
+		return tmpl.innerHTML.trim();
+	};
 
 rl.Utils = {
+	cleanHtml: cleanHtml,
 	htmlToPlain: htmlToPlain,
-	plainToHtml: plainToHtml
+	plainToHtml: plainToHtml,
+	htmlToMarkdown: htmlToMarkdown
+//	markdownToHtml: md => marked.parse(md)
 };

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(''));
+	}
+}

dev/Common/Links.js

@@ -1,13 +1,13 @@
 import { pInt } from 'Common/Utils';
-import { Settings } from 'Common/Globals';
+import { doc, Settings, SettingsAdmin } from 'Common/Globals';
 
 const
+	BASE = doc.location.pathname.replace(/\/+$/,'') + '/',
 	HASH_PREFIX = '#/',
-	SERVER_PREFIX = './?',
 
-	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[]=',
@@ -21,7 +21,7 @@ export const
 	/**
 	 * @returns {string}
 	 */
-	logoutLink = () => adminPath() ? prefix() : './',
+	logoutLink = () => adminPath() ? prefix() : BASE,
 
 	/**
 	 * @param {string} type
@@ -30,23 +30,24 @@ export const
 	 * @returns {string}
 	 */
 	serverRequestRaw = (type, hash) =>
-		SERVER_PREFIX + '/Raw/' + SUB_QUERY_PREFIX + '/'
-		+ '0/' // Settings.get('AccountHash') ?
+		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
@@ -54,13 +55,16 @@ 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')
+		BASE + '?/Lang/0/' + (isAdmin ? 'Admin' : 'App')
 			+ '/' + encodeURI(lang)
 			+ '/' + Settings.app('version') + '/',
 
@@ -75,6 +79,10 @@ export const
 	 * @returns {string}
 	 */
 	themePreviewLink = theme => {
+		if (theme.endsWith('@nextcloud')) {
+			theme = theme.slice(0, theme.length - 10).trim();
+			return parent.OC.webroot + '/themes/' + encodeURI(theme) + '/snappymail/preview.png';
+		}
 		let path = 'webVersionPath';
 		if (theme.endsWith('@custom')) {
 			theme = theme.slice(0, theme.length - 7).trim();

dev/Common/Selector.js

@@ -7,7 +7,7 @@ import { koComputable } from 'External/ko';
 	oCallbacks:
 		ItemSelect
 		MiddleClick
-		AutoSelect
+		canSelect
 		ItemGetUid
 		UpOrDown
 */
@@ -21,15 +21,13 @@ 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'] });
@@ -46,7 +44,7 @@ export class Selector {
 
 		this.sItemSelector = sItemSelector;
 		this.sItemCheckedSelector = sItemCheckedSelector;
-		this.sItemFocusedSelector = sItemFocusedSelector;
+		this.sItemFocusedSelector = sItemSelector + '.focused';
 
 		this.sLastUid = '';
 		this.oCallbacks = {};
@@ -65,8 +63,8 @@ export class Selector {
 		this.listChecked.subscribe(items => {
 			if (items.length) {
 				koSelectedItem() ? koSelectedItem(null) : koSelectedItem.valueHasMutated?.();
-			} else if (this.autoSelect()) {
-				koSelectedItem(koFocusedItem());
+			} else {
+				this.autoSelect();
 			}
 		});
 
@@ -74,7 +72,7 @@ export class Selector {
 
 		koSelectedItem.subscribe(item => {
 			if (item) {
-				koList.forEach(subItem => subItem.checked(false));
+//				koList.forEach(subItem => subItem.checked(false));
 				selectedItemUseCallback && itemSelectedThrottle(item);
 			} else {
 				selectedItemUseCallback && itemSelected();
@@ -87,8 +85,7 @@ export class Selector {
 		 * Below code is used to keep checked/focused/selected states when array is refreshed.
 		 */
 
-		let aCache = [],
-			aCheckedCache = [],
+		let aCheckedCache = [],
 			mFocused = null,
 			mSelected = null;
 
@@ -99,7 +96,6 @@ export class Selector {
 					items.forEach(item => {
 						const uid = this.getItemUid(item);
 						if (uid) {
-							aCache.push(uid);
 							item.checked() && aCheckedCache.push(uid);
 							if (!mFocused && item.focused()) {
 								mFocused = uid;
@@ -118,12 +114,12 @@ export class Selector {
 		koList.subscribe(aItems => {
 			selectedItemUseCallback = false;
 
-			koFocusedItem(null);
-			koSelectedItem(null);
+			this.unselect();
 
 			if (isArray(aItems)) {
 				let temp,
-					isChecked;
+					isChecked,
+					next = this.iFocusedNextHelper || this.iSelectNextHelper;
 
 				aItems.forEach(item => {
 					const uid = this.getItemUid(item);
@@ -148,24 +144,10 @@ export class Selector {
 
 				selectedItemUseCallback = true;
 
-				if (
-					(this.iSelectNextHelper || this.iFocusedNextHelper) &&
-					aItems.length &&
-					!koFocusedItem()
-				) {
-					temp = null;
-					if (this.iFocusedNextHelper) {
-						temp = aItems[-1 === this.iFocusedNextHelper ? aItems.length - 1 : 0];
-					}
-
-					if (!temp && this.iSelectNextHelper) {
-						temp = aItems[-1 === this.iSelectNextHelper ? aItems.length - 1 : 0];
-					}
-
+				if (next && aItems.length && !koFocusedItem()) {
+					temp = aItems[-1 === next ? aItems.length - 1 : 0];
 					if (temp) {
-						if (this.iSelectNextHelper) {
-							koSelectedItem(temp);
-						}
+						this.iSelectNextHelper && koSelectedItem(temp);
 
 						koFocusedItem(temp);
 
@@ -177,12 +159,9 @@ export class Selector {
 					this.iFocusedNextHelper = 0;
 				}
 
-				if (this.autoSelect() && !isChecked && !koSelectedItem()) {
-					koSelectedItem(koFocusedItem());
-				}
+				!isChecked && !koSelectedItem() && this.autoSelect();
 			}
 
-			aCache = [];
 			aCheckedCache = [];
 			mFocused = null;
 			mSelected = null;
@@ -206,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);
@@ -254,8 +234,10 @@ export class Selector {
 	/**
 	 * @returns {boolean}
 	 */
-	autoSelect() {
-		return (this.oCallbacks.AutoSelect || (()=>1))() && this.focusedItem();
+	autoSelect(bForce) {
+		(bForce || (this.oCallbacks.canSelect || (()=>1))())
+		&& this.focusedItem()
+		&& this.selectedItem(this.focusedItem());
 	}
 
 	/**
@@ -272,10 +254,11 @@ export class Selector {
 	 * @param {boolean=} bForceSelect = false
 	 */
 	newSelectPosition(sEventKey, bShiftKey, bForceSelect) {
-		let isArrow = 'ArrowUp' === sEventKey || 'ArrowDown' === sEventKey,
-			result;
+		let result;
 
-		const pageStep = 10,
+		const up = 'ArrowUp' === sEventKey,
+			isArrow = up || 'ArrowDown' === sEventKey,
+			pageStep = 10,
 			list = this.list(),
 			listLen = list.length,
 			focused = this.focusedItem();
@@ -287,8 +270,7 @@ export class Selector {
 		} else if (listLen) {
 			if (focused) {
 				if (isArrow) {
-					let i = list.indexOf(focused),
-						up = 'ArrowUp' == sEventKey;
+					let i = list.indexOf(focused);
 					if (bShiftKey) {
 						shiftStart = -1 < shiftStart ? shiftStart : i;
 						shiftStart == i
@@ -331,9 +313,7 @@ export class Selector {
 
 			if (result) {
 				this.focusedItem(result);
-				if ((this.autoSelect() || bForceSelect) && !this.list.hasChecked()) {
-					this.selectedItem(result);
-				}
+				!this.list.hasChecked() && this.autoSelect(bForceSelect);
 				this.scrollToFocused();
 			}
 		}

dev/Common/Translator.js

@@ -1,5 +1,5 @@
 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';
@@ -12,8 +12,8 @@ const
 	init = () => {
 		if (rl.I18N) {
 			I18N_DATA = rl.I18N;
-			Date.defineRelativeTimeFormat(rl.relativeTime || {});
 			rl.I18N = null;
+			doc.documentElement.dir = I18N_DATA.LANG_DIR;
 			return 1;
 		}
 	},
@@ -21,13 +21,39 @@ 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
 	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
 	 * @param {Object=} valueList
@@ -35,7 +61,7 @@ export const
 	 * @returns {string}
 	 */
 	i18n = (key, valueList, defaulValue) => {
-		let result = null == defaulValue ? key : defaulValue;
+		let result = defaulValue ?? key;
 		let path = key.split('/');
 		if (I18N_DATA[path[0]] && path[1]) {
 			result = I18N_DATA[path[0]][path[1]] || result;
@@ -75,30 +101,33 @@ export const
 
 	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',0,LanguageStore.hourCycle())});
-					if (mt > dt - 86400000)
-						return i18n('MESSAGE_LIST/YESTERDAY_AT', {TIME: m.format('LT',0,LanguageStore.hourCycle())});
-					if (date.getFullYear() === m.getFullYear())
-						return m.format('d M');
-					return m.format('LL',0,LanguageStore.hourCycle());
+					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',0,LanguageStore.hourCycle());
+					return m.format('LLL',0,h);
 				default:
-					return m.format(formatStr,0,LanguageStore.hourCycle());
+					return m.format(formatStr,0,h);
 			}
 		}
 
@@ -108,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
@@ -127,9 +155,7 @@ export const
 		}
 	},
 
-	reloadTime = () => setTimeout(() =>
-			doc.querySelectorAll('time').forEach(element => timeToNode(element))
-			, 1),
+	reloadTime = () => doc.querySelectorAll('time').forEach(element => timeToNode(element)),
 
 	/**
 	 * @param {Function} startCallback
@@ -149,7 +175,7 @@ export const
 	 */
 	getNotification = (code, message = '', defCode = 0) => {
 		code = pInt(code);
-		if (Notification.ClientViewError === code && message) {
+		if (Notifications.ClientViewError === code && message) {
 			return message;
 		}
 
@@ -158,6 +184,9 @@ export const
 			|| '';
 	},
 
+	getErrorMessage = (code, data) =>
+		getNotification(code) || data?.messageAdditional || data?.message || data,
+
 	/**
 	 * @param {*} code
 	 * @returns {string}
@@ -171,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();
 					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}
@@ -201,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();

dev/Common/Utils.js

@@ -10,19 +10,22 @@ export const
 
 	pInt = (value, defaultValue = 0) => {
 		value = parseInt(value, 10);
-		return isNaN(value) || !isFinite(value) ? defaultValue : value;
+		return isFinite(value) ? value : defaultValue;
 	},
 
 	defaultOptionsAfterRender = (domItem, item) =>
 		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(/=+$/, ''),
 
 	getKeyByValue = (o, v) => Object.keys(o).find(key => o[key] === v);

dev/Common/UtilsUser.js

@@ -1,26 +1,68 @@
-import { MessageFlagsCache } 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, 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
 
-moveAction = ko.observable(false),
+// 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}
@@ -42,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}
  */
@@ -50,14 +115,15 @@ 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
+					};
 
 				push ? result.push(data) : result.unshift(data);
 			};
@@ -66,7 +132,7 @@ computedPaginatorHelper = (koCurrentPage, koPageCount) => {
 			next = 0,
 			limit = 2;
 
-		if (1 < pageCount || (0 < pageCount && pageCount < currentPage)) {
+		if (1 < pageCount) {
 			if (pageCount < currentPage) {
 				fAdd(pageCount);
 				prev = pageCount;
@@ -133,29 +199,15 @@ mailToHelper = mailToUrl => {
 		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'),
@@ -173,37 +225,24 @@ 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) || SettingsGet('Resizer' + sClientSideKeyName + mode),
-			setTargetPos = mode => {
-				let value;
-				if ('Width' == mode) {
-					value = source.offsetWidth;
-					target.style.left = value + 'px';
-				} else {
-					value = source.offsetHeight;
-					target.style.top = (4 + source.offsetTop + value) + 'px';
-				}
-				return value;
-			};
+		const length = Local.get(sClientSideKeyName + mode) || SettingsGet('Resizer' + sClientSideKeyName + mode);
 		if (length) {
 			source.style[mode.toLowerCase()] = length + 'px';
-			setTargetPos(mode);
 		}
 		if (!source.layoutResizer) {
 			const resizer = createElement('div', {'class':'resizer'}),
 				save = (data => Remote.saveSettings(0, data)).debounce(500),
 				size = {},
 				store = () => {
-					const value = setTargetPos(resizer.mode),
+					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});
@@ -250,114 +289,86 @@ setLayoutResizer = (source, target, sClientSideKeyName, mode) =>
 	}
 },
 
+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) {
 		popup || MessageUserStore.message(oMessage);
-		popup || MessageUserStore.loading(true);
-		Remote.message((iError, oData/*, bCached*/) => {
-			if (iError) {
-				if (Notification.RequestAborted !== iError && !popup) {
-					MessageUserStore.message(null);
-					MessageUserStore.error(getNotification(iError));
-				}
-			} else {
-				let json = oData?.Result;
-
-				if (
-					json &&
-					MessageModel.validJson(json) &&
-					oMessage.folder === json.Folder
-				) {
-					const threads = oMessage.threads(),
-						isNew = !popup && oMessage.uid != json.Uid && threads.includes(json.Uid),
-						messagesDom = MessageUserStore.bodiesDom();
-					if (isNew) {
-						oMessage = MessageModel.reviveFromJson(json);
-						if (oMessage) {
-							oMessage.threads(threads);
-							MessageFlagsCache.initMessage(oMessage);
-
-							// Set clone
-							oMessage = MessageModel.fromMessageListItem(oMessage);
-						}
-						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 (oMessage && oMessage.uid == json.Uid) {
-						popup || 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 || oMessage.revivePropertiesFromJson(json);
-
-						if (messagesDom) {
-							let id = 'rl-msg-' + oMessage.hash.replace(/[^a-zA-Z0-9]/g, ''),
-								body = elementById(id);
-							if (body) {
-								oMessage.body = body;
-								oMessage.isHtml(body.classList.contains('html'));
-								oMessage.hasImages(body.rlHasImages);
-							} else {
-								body = Element.fromHTML('<div id="' + id + '" hidden="" class="b-text-part '
-									+ (oMessage.pgpSigned() ? ' openpgp-signed' : '')
-									+ (oMessage.pgpEncrypted() ? ' openpgp-encrypted' : '')
-									+ '">'
-									+ '</div>');
-								oMessage.body = body;
-								if (!SettingsUserStore.viewHTML() || !oMessage.viewHtml()) {
-									oMessage.viewPlain();
-								}
-
-								MessageUserStore.purgeMessageBodyCache();
-							}
-
-							messagesDom.append(body);
-
-							popup || (oMessage.body.hidden = false);
-							popup && oMessage.viewPopupMessage();
-						}
-
-						MessageFlagsCache.initMessage(oMessage);
-						if (oMessage.isUnseen()) {
-							MessageUserStore.MessageSeenTimer = setTimeout(
-								() => MessagelistUserStore.setAction(oMessage.folder, MessageSetAction.SetSeen, [oMessage]),
-								SettingsUserStore.messageReadDelay() * 1000 // seconds
-							);
-						}
-
-						if (isNew) {
-							let selectedMessage = MessagelistUserStore.selectedMessage();
-							if (
-								selectedMessage &&
-								(oMessage.folder !== selectedMessage.folder || oMessage.uid != selectedMessage.uid)
-							) {
-								MessagelistUserStore.selectedMessage(null);
-								if (1 === MessagelistUserStore.length) {
-									MessagelistUserStore.focusedMessage(null);
-								}
-							} else if (!selectedMessage) {
-								selectedMessage = MessagelistUserStore.find(
-									subMessage =>
-										subMessage &&
-										subMessage.folder === oMessage.folder &&
-										subMessage.uid == oMessage.uid
-								);
-
-								if (selectedMessage) {
-									MessagelistUserStore.selectedMessage(selectedMessage);
-									MessagelistUserStore.focusedMessage(selectedMessage);
-								}
-							}
-						}
+						viewMessage(oMessage, popup);
 					}
 				}
-			}
-			popup || MessageUserStore.loading(false);
-		}, oMessage.folder, oMessage.uid);
+				popup || MessageUserStore.loading(false);
+			}, oMessage.folder, oMessage.uid);
+		}
 	}
 };
 
-leftPanelDisabled.subscribe(value => value && moveAction(false));
+leftPanelDisabled.subscribe(value => value && moveAction(0));
 moveAction.subscribe(value => value && leftPanelDisabled(false));

dev/Component/Checkbox.js

@@ -1,10 +1,12 @@
 export class CheckboxComponent {
 	constructor(params = {}) {
+		this.name = params.name;
+
 		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);
+			: ko.observable(params.enable ?? 1);
 
 		this.label = params.label;
 	}

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?.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;
 
@@ -144,7 +166,9 @@ export class EmailAddressesComponent {
 
 	_parseInput(force) {
 		let val = this.input.value;
-		if ((force || val.includes(',') || val.includes(';')) && this._parseValue(val)) {
+		if ((force || val.includes(',') || val.includes(';')
+				|| (val.charAt(val.length-1)===' ' && this._simpleEmailMatch(val)))
+			&& this._parseValue(val)) {
 			this.input.value = '';
 		}
 		this._resizeInput();
@@ -154,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]));
 
@@ -263,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());

dev/DAV/JCard.js

@@ -15,7 +15,7 @@ export class JCard {
 		if (input) {
 			// read from jCard
 			if (typeof input !== 'object') {
-				throw new Error('error reading vcard')
+				throw Error('error reading vcard')
 			}
 			this.parseFromJCard(input)
 		}
@@ -87,7 +87,7 @@ export class JCard {
 			arg = new VCardProperty(String(arg), value, params, type);
 		}
 		if (!(arg instanceof VCardProperty)) {
-			throw new Error('invalid argument of VCard.set(), expects string arguments or a VCardProperty');
+			throw Error('invalid argument of VCard.set(), expects string arguments or a VCardProperty');
 		}
 		let field = arg.getField();
 		this.props.set(field, [arg]);
@@ -101,7 +101,7 @@ export class JCard {
 			arg = new VCardProperty(String(arg), value, params, type);
 		}
 		if (!(arg instanceof VCardProperty)) {
-			throw new Error('invalid argument of VCard.add(), expects string arguments or a VCardProperty');
+			throw Error('invalid argument of VCard.add(), expects string arguments or a VCardProperty');
 		}
 		// VCardProperty arguments
 		let field = arg.getField();
@@ -124,15 +124,15 @@ export class JCard {
 		// VCardProperty argument
 		else if (arg instanceof VCardProperty) {
 			let propArray = this.props.get(arg.getField());
-			if (!(propArray === null || propArray === void 0 ? void 0 : propArray.includes(arg)))
-				throw new Error("Attempted to remove VCardProperty VCard does not have: ".concat(arg));
+			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 new Error('invalid argument of VCard.remove(), expects ' +
+			throw Error('invalid argument of VCard.remove(), expects ' +
 				'string and optional param filter or a VCardProperty');
 	}
 
@@ -202,7 +202,7 @@ export class JCard {
 	parseFullName(options) {
 		let n = this.getOne('n');
 		if (n === undefined) {
-			throw new Error('\'fn\' VCardProperty not present in card, cannot parse full name');
+			throw Error('\'fn\' VCardProperty not present in card, cannot parse full name');
 		}
 		let fnString = '';
 		// Position in n -> position in fn

dev/DAV/VCardProperty.js

@@ -55,7 +55,7 @@ export class VCardProperty {
 		}
 		// invalid property
 		else {
-			throw new Error('invalid Property constructor');
+			throw Error('invalid Property constructor');
 		}
 	}
 

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,65 +10,43 @@ 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 = {
@@ -84,8 +58,7 @@ class SquireUI
 							[i18n('SETTINGS_GENERAL/EDITOR_HTML'),'wysiwyg'],
 							[i18n('SETTINGS_GENERAL/EDITOR_PLAIN'),'plain']
 						],
-						cmd: s => this.setMode('plain' == s.value ? 'plain' : 'wysiwyg'),
-						hint: i18n('EDITOR/TEXT_SWITCHER_PLAIN_TEXT', 'Plain')
+						cmd: s => this.setMode('plain' == s.value ? 'plain' : 'wysiwyg')
 					}
 				},
 				font: {
@@ -111,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: {
@@ -132,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: {
@@ -170,13 +168,13 @@ 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: '"',
@@ -184,19 +182,17 @@ class SquireUI
 							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: {
@@ -209,21 +205,21 @@ class SquireUI
 								url.length ? squire.makeLink(url) : (node && squire.removeLink());
 							}
 						},
-						hint: 'Link'
+						matches: 'A'
 					},
 					imageUrl: {
 						html: '🖼️',
 						cmd: () => {
 							let node = squire.getSelectionClosest('IMG'),
 								src = prompt("Image", node?.src || "https://");
-							src.length ? squire.insertImage(src) : (node && squire.detach(node));
+							src?.length ? squire.insertImage(src) : node?.remove();
 						},
-						hint: 'Image URL'
+						matches: 'IMG'
 					},
 					imageUpload: {
 						html: '📂️',
 						cmd: () => browseImage.click(),
-						hint: 'Image select',
+						matches: 'IMG'
 					}
 				},
 /*
@@ -235,19 +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: () => this.setMode('source' == this.mode ? 'wysiwyg' : 'source'),
-						hint: i18n('EDITOR/TEXT_SWITCHER_SOURCE', 'Source')
+						cmd: btn => {
+							this.setMode('source' == this.mode ? 'wysiwyg' : 'source');
+							btn.classList.toggle('active', 'source' == this.mode);
+						}
+					}
+				},
+
+				clear: {
+					removeStyle: {
+						html: '⎚',
+						cmd: () => squire.setStyle()
 					}
 				}
 			},
@@ -258,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';
@@ -271,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*/;
 		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;
@@ -310,6 +330,7 @@ class SquireUI
 							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;
@@ -318,7 +339,7 @@ class SquireUI
 								option.style[action] = value;
 								group.append(option);
 							});
-							input.append(group);
+							input.add(group);
 						});
 					}
 					ev = 'input';
@@ -342,6 +363,7 @@ class SquireUI
 */
 				}
 				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) {
@@ -359,36 +381,178 @@ class SquireUI
 
 		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) {
@@ -401,11 +565,11 @@ class SquireUI
 			fn = {UL:'makeUnorderedList',OL:'makeOrderedList'};
 		(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, source = 'source' == this.mode;
@@ -426,7 +590,6 @@ class SquireUI
 		this.modeSelect.selectedIndex = 'plain' == this.mode ? 1 : 0;
 	}
 
-	// CKeditor gimmicks used by HtmlEditor
 	on(type, fn) {
 		if ('mode' == type) {
 			this.onModeChange = fn;
@@ -469,6 +632,7 @@ class SquireUI
 					// Move cursor above signature
 					div.before(br);
 					div.before(br.cloneNode());
+//					squire._docWasChanged();
 				}
 				this._prev_txt_sig = signature;
 			} catch (e) {
@@ -492,6 +656,18 @@ class SquireUI
 		squire.setSelection( range );
 	}
 
+	getPlainData() {
+		return this.plain.value;
+	}
+
+	setPlainData(text) {
+		this.plain.value = text;
+	}
+
+	blur() {
+		this.squire.blur();
+	}
+
 	focus() {
 		if ('plain' == this.mode) {
 			this.plain.focus();

dev/External/User/ko.js

@@ -1,12 +1,12 @@
 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 { doc, elementById, addEventsListeners, dropdowns, leftPanelDisabled } from 'Common/Globals';
-import { dropdownsDetectVisibility } from 'Common/UtilsUser';
 import { EmailAddressesComponent } from 'Component/EmailAddresses';
 import { ThemeStore } from 'Stores/Theme';
-import { moveMessagesToFolder, dropFilesInFolder } 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';
@@ -44,7 +44,7 @@ const rlContentType = 'snappymail/action',
 		let files = false;
 //		if (e.dataTransfer.types.includes('Files'))
 		for (const item of e.dataTransfer.items) {
-			files |= 'file' === item.kind && 'message/rfc822' === item.type;
+			files |= 'file' === item.kind && RFC822 === item.type;
 		}
 		if (files || dragMessages()) {
 			e.stopPropagation();
@@ -63,7 +63,9 @@ const rlContentType = 'snappymail/action',
 	dragDrop = (e, element, folder, dragData) => {
 		dragStop(e, element);
 		if (dragMessages() && 'copyMove' == e.dataTransfer.effectAllowed) {
-			moveMessagesToFolder(FolderUserStore.currentFolderFullName(), dragData.data, folder.fullName, e.ctrlKey);
+			MessagelistUserStore.moveMessages(
+				FolderUserStore.currentFolderFullName(), dragData.data, folder.fullName, e.ctrlKey
+			);
 		} else if (e.dataTransfer.types.includes('Files')) {
 			dropFilesInFolder(folder.fullName, e.dataTransfer.files);
 		}
@@ -89,19 +91,19 @@ Object.assign(ko.bindingHandlers, {
 				};
 
 			if (ko.isObservable(fValue)) {
-				editor = new HtmlEditor(element, fUpdateKoValue, fOnReady, fUpdateKoValue);
+				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
 	},
@@ -192,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;
 				},
@@ -245,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);
-			}
-		}
 	}
 });

dev/External/ko.js

@@ -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) =>
@@ -28,6 +29,22 @@ export const
 
 	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);
@@ -50,46 +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, viewModel) => {
-			let fn = event => {
-				if ('Escape' == event.key) {
-					element.dispatchEvent(new Event('change'));
-					fValueAccessor().call(viewModel);
-				}
-			};
-			element.addEventListener('keyup', fn);
-			ko.utils.domNodeDisposal.addDisposeCallback(element, () => element.removeEventListener('keyup', fn));
-		}
+		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());
 		}
 	},
 
@@ -100,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(
@@ -121,10 +119,8 @@ Object.assign(ko.bindingHandlers, {
 			);
 		},
 		update: (element, fValueAccessor) => {
-			const cl = element.classList;
-
 			let disabled = !fValueAccessor().canExecute();
-			cl.toggle('disabled', disabled);
+			element.classList.toggle('disabled', disabled);
 
 			if (element.matches('INPUT,TEXTAREA,BUTTON')) {
 				element.disabled = disabled;
@@ -180,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] });
 };

dev/Html/PreviewMessage.html

@@ -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>

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) {
@@ -80,13 +84,11 @@ export class AbstractModel {
 	}
 
 	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 +105,11 @@ export class AbstractModel {
 					this[key] = typeCast(this[key], value);
 					break;
 				case 'undefined':
+					console.log(`Undefined ${model.name}.${key} set`);
 					this[key] = value;
-					// fall through
-				default:
+					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;
 	}
 
 }

dev/Knoin/AbstractViews.js

@@ -1,7 +1,7 @@
 import ko from 'ko';
 
 import { addObservablesTo, addComputablesTo, addSubscribablesTo } from 'External/ko';
-import { keyScope, addShortcut, SettingsGet, leftPanelDisabled, toggleLeftPanel, elementById } from 'Common/Globals';
+import { keyScope, addShortcut, SettingsGet, toggleLeftPanel, elementById } from 'Common/Globals';
 import { ViewTypePopup, showScreenPopup } from 'Knoin/Knoin';
 
 import { SaveSettingStatus } from 'Common/Enums';
@@ -59,10 +59,10 @@ export class AbstractViewPopup extends AbstractView
 		super('Popups' + name, ViewTypePopup);
 		this.keyScope.scope = name;
 		this.modalVisible = ko.observable(false).extend({ rateLimit: 0 });
+		this.close = () => this.modalVisible(false);
+		this.tryToClose = () => (false === this.onClose()) || this.close();
 		addShortcut('escape,close', '', name, () => {
-			if (this.modalVisible() && false !== this.onClose()) {
-				this.close();
-			}
+			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() {}
 */
 }
 
@@ -96,7 +94,6 @@ export class AbstractViewLeft extends AbstractView
 	constructor(templateID)
 	{
 		super(templateID, 'left');
-		this.leftPanelDisabled = leftPanelDisabled;
 		this.toggleLeftPanel = toggleLeftPanel;
 	}
 }
@@ -118,6 +115,11 @@ 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),
@@ -133,6 +135,7 @@ export class AbstractViewSettings
 				rl.app.Remote.saveSetting(name, value,
 					iError => {
 						this[trigger](iError ? SaveSettingStatus.Failed : SaveSettingStatus.Success);
+//						iError || Settings.set(name, value);
 						setTimeout(() => this[trigger](SaveSettingStatus.Idle), 1000);
 					}
 				);
@@ -140,6 +143,10 @@ export class AbstractViewSettings
 		});
 	}
 
+	/**
+	 * 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 => {

dev/Knoin/Knoin.js

@@ -1,9 +1,12 @@
 import ko from 'ko';
 import { koComputable } from 'External/ko';
-import { doc, $htmlCL, elementById, fireEvent } from 'Common/Globals';
+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
 	currentScreen = null,
 	defaultScreenName = '';
@@ -22,13 +25,13 @@ const
 	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,
@@ -36,35 +39,30 @@ const
 				dialog = ViewTypePopup === vm.viewType,
 				vmPlace = doc.getElementById(position);
 
-			ViewModelClass.__builded = true;
-			ViewModelClass.__vm = vm;
-
 			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 = ViewModelClass.__dom = vmDom;
+				vm.viewModelDom = vmDom;
 
 				if (dialog) {
-					vm.close = () => hideScreenPopup(ViewModelClass);
-
 					// Firefox < 98 / Safari < 15.4 HTMLDialogElement not defined
 					if (!vmDom.showModal) {
 						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.close = () => {
 //							if (vmDom.dispatchEvent(new CustomEvent('cancel', {cancelable:true}))) {
 								vmDom.backdrop.hidden = true;
-								vmDom.returnValue = v;
 								vmDom.removeAttribute('open', null);
 								vmDom.open = false;
 //								vmDom.dispatchEvent(new CustomEvent('close'));
@@ -76,14 +74,17 @@ const
 //					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?.();
+								fireEvent('rl-vm-visible', vm);
 							} else {
 								vmDom.close();
 								vm.afterHide?.();
+//								fireEvent('rl-vm-hidden', vm);
 							}
 						}
 					};
@@ -98,6 +99,7 @@ const
 								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
@@ -138,10 +140,9 @@ const
 		screen.viewModels.forEach(ViewModelClass => {
 			if (
 				ViewModelClass.__vm &&
-				ViewModelClass.__dom &&
 				ViewTypePopup !== ViewModelClass.__vm.viewType
 			) {
-				fn(ViewModelClass.__vm, ViewModelClass.__dom);
+				fn(ViewModelClass.__vm, ViewModelClass.__vm.viewModelDom);
 			}
 		});
 	},
@@ -151,85 +152,69 @@ const
 		forEachViewModel(screenToHide, (vm, dom) => {
 			dom.hidden = true;
 			vm.onHide?.();
-			destroy && vm.viewModelDom.remove();
+			destroy && dom.remove();
 		});
+		ThemeStore.isMobile() && leftPanelDisabled(true);
 	},
 
-	/**
-	 * @param {Function} ViewModelClassToHide
-	 * @returns {void}
-	 */
-	hideScreenPopup = ViewModelClassToHide =>
-		ViewModelClassToHide?.__vm && ViewModelClassToHide.__dom
-		&& ViewModelClassToHide.__vm.modalVisible(false),
-
 	/**
 	 * @param {string} screenName
 	 * @param {string} subPart
 	 * @returns {void}
 	 */
 	screenOnRoute = (screenName, subPart) => {
-		let vmScreen = null,
-			isSameScreen = false;
-
-		if (null == screenName || '' == screenName) {
-			screenName = defaultScreenName;
-		}
-
-		if (fireEvent('sm-show-screen', screenName, 1)) {
-
+		screenName = screenName || defaultScreenName;
+		if (screenName && fireEvent('sm-show-screen', screenName + (subPart ?  '/' + subPart : ''), 1)) {
 			// Close all popups
 			for (let vm of visiblePopups) {
-				(false === vm.onClose()) || vm.close();
+				vm.tryToClose();
 			}
 
-			if (screenName) {
-				vmScreen = screen(screenName);
-				if (!vmScreen) {
-					vmScreen = screen(defaultScreenName);
-					if (vmScreen) {
-						subPart = screenName + '/' + subPart;
-						screenName = defaultScreenName;
-					}
+			let vmScreen = screen(screenName);
+			if (!vmScreen) {
+				vmScreen = screen(defaultScreenName);
+				if (vmScreen) {
+					subPart = screenName + '/' + subPart;
+					screenName = defaultScreenName;
+				}
+			}
+
+			if (vmScreen?.__started) {
+				let isSameScreen = currentScreen && vmScreen === currentScreen;
+
+				if (!vmScreen.__builded) {
+					vmScreen.__builded = true;
+
+					vmScreen.viewModels.forEach(ViewModelClass =>
+						buildViewModel(ViewModelClass, vmScreen)
+					);
+
+					vmScreen.onBuild?.();
 				}
 
-				if (vmScreen?.__started) {
-					isSameScreen = currentScreen && vmScreen === currentScreen;
+				setTimeout(() => {
+					// hide screen
+					currentScreen && !isSameScreen && hideScreen(currentScreen);
+					// --
 
-					if (!vmScreen.__builded) {
-						vmScreen.__builded = true;
+					currentScreen = vmScreen;
 
-						vmScreen.viewModels.forEach(ViewModelClass =>
-							buildViewModel(ViewModelClass, vmScreen)
-						);
+					// show screen
+					if (!isSameScreen) {
+						vmScreen.onShow?.();
 
-						vmScreen.onBuild?.();
+						forEachViewModel(vmScreen, (vm, dom) => {
+							vm.beforeShow?.();
+							i18nToNodes(dom);
+							dom.hidden = false;
+							vm.onShow?.();
+							autofocus(dom);
+						});
 					}
+					// --
 
-					setTimeout(() => {
-						// hide screen
-						currentScreen && !isSameScreen && hideScreen(currentScreen);
-						// --
-
-						currentScreen = vmScreen;
-
-						// show screen
-						if (!isSameScreen) {
-							vmScreen.onShow?.();
-
-							forEachViewModel(vmScreen, (vm, dom) => {
-								vm.beforeShow?.();
-								i18nToNodes(dom);
-								dom.hidden = false;
-								vm.onShow?.();
-								autofocus(dom);
-							});
-						}
-						// --
-
-						vmScreen.__cross?.parse(subPart);
-					}, 1);
-				}
+					vmScreen.__cross?.parse(subPart);
+				}, 1);
 			}
 		}
 	};
@@ -244,15 +229,11 @@ 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?.(...params);
-
 			vm.modalVisible(true);
-
 			vm.onShow?.(...params);
 		}
 	},
@@ -285,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();

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;
+}

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});
+		}
+	};

dev/Mime/Parser.js

@@ -1,16 +1,5 @@
-
-const
-	// RFC2045
-	QPDecodeParams = [/=([0-9A-F]{2})/g, (...args) => String.fromCharCode(parseInt(args[1], 16))],
-	QPDecode = data => data.replace(/=\r?\n/g, '').replace(...QPDecodeParams),
-	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});
-		}
-	};
+import { decodeEncodedWords, BDecode, BEncode, QPDecode, decodeText } from 'Mime/Encoding';
+import { addressparser } from 'Mime/Address';
 
 export function ParseMime(text)
 {
@@ -26,7 +15,52 @@ export function ParseMime(text)
 			this.bodyEnd = 0;
 			this.boundary = '';
 			this.bodyText = '';
-			this.headers = {};
+			// 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.
+			};
 		}
 */
 
@@ -49,25 +83,25 @@ export function ParseMime(text)
 		get body() {
 			let body = this.bodyRaw,
 				charset = this.header('content-type')?.params.charset,
-				encoding = this.headerValue('content-transfer-encoding');
+				encoding = this.headerValue('content-transfer-encoding')?.toLowerCase();
 			if ('quoted-printable' == encoding) {
 				body = QPDecode(body);
 			} else if ('base64' == encoding) {
-				body = atob(body.replace(/\r?\n/g, ''));
+				body = BDecode(body.replace(/\r?\n/g, ''));
 			}
 			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 = QPDecode(body);
 				}
-				body = btoa(body);
+				body = BEncode(body);
 			}
 			return 'data:' + this.headerValue('content-type') + ';base64,' + body;
 		}
@@ -78,7 +112,7 @@ export function ParseMime(text)
 		}
 
 		getByContentType(type) {
-			if (type == this.headerValue('content-type')) {
+			if (type == this.headerValue('content-type')?.toLowerCase()) {
 				return this;
 			}
 			let i = 0, p = this.parts, part;
@@ -90,6 +124,9 @@ export function ParseMime(text)
 		}
 	}
 
+	// mailbox-list or address-list
+	const lists = ['from','reply-to','to','cc','bcc'];
+
 	const ParsePart = (mimePart, start_pos = 0, id = '') =>
 	{
 		let part = new MimePart,
@@ -111,11 +148,19 @@ export function ParseMime(text)
 					[...header.matchAll(/;\s*([^;=]+)=\s*"?([^;"]+)"?/g)].forEach(param =>
 						params[param[1].trim().toLowerCase()] = param[2].trim()
 					);
-					// encoded-word = "=?" charset "?" encoding "?" encoded-text "?="
-					match[2] = match[2].trim().replace(/=\?([^?]+)\?(B|Q)\?(.+?)\?=/g, (m, charset, encoding, text) =>
-						decodeText(charset, 'B' == encoding ? atob(text) : QPDecode(text))
-					);
-					headers[match[1].trim().toLowerCase()] = {
+					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
 					};
@@ -130,7 +175,7 @@ export function ParseMime(text)
 			let boundary = headers['content-type']?.params.boundary;
 			if (boundary) {
 				part.boundary = boundary;
-				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;

dev/Mime/Utils.js

@@ -1,38 +1,43 @@
 
 import { ParseMime } from 'Mime/Parser';
 import { AttachmentModel } from 'Model/Attachment';
-import { EmailModel } from 'Model/Email';
 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 : '';
 
-		if (struct.headers.subject) {
-			message.subject(struct.headers.subject.value);
-		}
+		// Content-Type: ...; protected-headers="v1"
+		subject && message.subject(subject);
+
+		// EmailCollectionModel
 		['from','to'].forEach(name => {
-			if (struct.headers[name] && !message[name].length) {
-				let mail = new EmailModel;
-				mail.parse(struct.headers[name].value);
-				message[name].push(mail);
-			}
+			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;
@@ -40,17 +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.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);
@@ -62,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
+				});
 			}
 		});
 
@@ -78,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?
 }

dev/Model/AbstractCollection.js

@@ -5,7 +5,7 @@ export class AbstractCollectionModel extends Array
 	constructor() {
 /*
 		if (new.target === AbstractCollectionModel) {
-			throw new Error("Can't instantiate AbstractCollectionModel!");
+			throw Error("Can't instantiate AbstractCollectionModel!");
 		}
 */
 		super();

dev/Model/Account.js

@@ -1,6 +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 {
 	/**
@@ -23,7 +24,12 @@ export class AccountModel extends AbstractModel {
 		});
 
 		// Load at random between 3 and 30 seconds
-		isAdditional && setTimeout(()=>this.fetchUnread(), (Math.ceil(Math.random() * 10)) * 3000);
+		SettingsUserStore.showUnreadCount() && isAdditional
+		&& setTimeout(()=>this.fetchUnread(), (Math.ceil(Math.random() * 10)) * 3000);
+	}
+
+	label() {
+		return this.name || IDN.toUnicode(this.email);
 	}
 
 	/**

dev/Model/Attachment.js

@@ -1,6 +1,8 @@
 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
@@ -18,13 +20,12 @@ export class AttachmentModel extends AbstractModel {
 		this.checked = ko.observable(true);
 
 		this.mimeType = '';
+//		this.mimeTypeParams = '';
 		this.fileName = '';
 		this.fileNameExt = '';
 		this.fileType = FileType.Unknown;
-		this.isThumbnail = false;
-		this.cid = '';
+		this.cId = '';
 		this.contentLocation = '';
-		this.download = '';
 		this.folder = '';
 		this.uid = '';
 		this.url = '';
@@ -52,7 +53,7 @@ export class AttachmentModel extends AbstractModel {
 	}
 
 	toggleChecked(self, event) {
-		event.stopPropagation();
+		stopEvent(event);
 		self.checked(!self.checked());
 	}
 
@@ -61,7 +62,7 @@ export class AttachmentModel extends AbstractModel {
 	}
 
 	contentId() {
-		return this.cid.replace(/^<+|>+$/g, '');
+		return this.cId.replace(/^<+|>+$/g, '');
 	}
 
 	/**
@@ -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}
 	 */
@@ -142,7 +157,7 @@ export class AttachmentModel extends AbstractModel {
 	 * @returns {boolean}
 	 */
 	hasThumbnail() {
-		return this.isThumbnail && !this.isLinked();
+		return SettingsCapa('AttachmentThumbnails') && this.isImage() && !this.isLinked();
 	}
 
 	/**
@@ -151,7 +166,7 @@ export class AttachmentModel extends AbstractModel {
 	thumbnailStyle() {
 		return this.hasThumbnail()
 			? 'background:url(' + serverRequestRaw('ViewThumbnail', this.download) + ')'
-			: '';
+			: null;
 	}
 
 	/**

dev/Model/AttachmentCollection.js

@@ -1,3 +1,4 @@
+import { baseCollator } from 'Common/Translator';
 import { AbstractCollectionModel } from 'Model/AbstractCollection';
 import { AttachmentModel } from 'Model/Attachment';
 
@@ -10,22 +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;
 	}
 
 	/**
-	 * @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());
 	}
 }

dev/Model/ComposeAttachment.js

@@ -10,16 +10,16 @@ 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;
 

dev/Model/Contact.js

@@ -86,6 +86,7 @@ export class ContactModel extends AbstractModel {
 			focused: false,
 			selected: false,
 			checked: false,
+			sendToAll: true,
 
 			deleted: false,
 			readOnly: false,
@@ -134,22 +135,6 @@ export class ContactModel extends AbstractModel {
 		});
 	}
 
-	/**
-	 * @returns {Array|null}
-	 */
-	getNameAndEmailHelper() {
-		let name = (this.givenName() + ' ' + this.surName()).trim(),
-			email = this.email()[0]?.value();
-/*
-//		this.jCard.getOne('fn')?.notEmpty() ||
-		this.jCard.parseFullName({set:true});
-//		let name = this.jCard.getOne('nickname'),
-		let name = this.jCard.getOne('fn'),
-			email = this.jCard.getOne('email');
-*/
-		return email ? [email, name] : null;
-	}
-
 	/**
 	 * @static
 	 * @param {jCard} json
@@ -209,19 +194,15 @@ export class ContactModel extends AbstractModel {
 		return contact;
 	}
 
-	/**
-	 * @returns {string}
-	 */
-	generateUid() {
-		return '' + this.id;
-	}
-
 	addEmail() {
 		// home, work
 		this.email.push({
 			value: ko.observable('')
 //			type: prop.params.type
 		});
+
+		if (this.sendToAllDisplayStatus())
+			document.getElementById('send-to-all').style.display = 'block';
 	}
 
 	addTel() {
@@ -264,7 +245,7 @@ export class ContactModel extends AbstractModel {
 			this.namePrefix(),
 			this.nameSuffix()
 		]/*, params, group*/);
-//		jCard.parseFullName({set:true});
+		jCard.parseFullName({set:true});
 
 		['nickname', 'note', 'title'].forEach(field =>
 			this[field]() ? jCard.set(field, this[field]()/*, params, group*/) : jCard.remove(field)
@@ -304,7 +285,7 @@ export class ContactModel extends AbstractModel {
 //		jCard.set('rev', '2022-05-21T10:59:52Z')
 
 		return {
-			Uid: this.id,
+			uid: this.id,
 			jCard: JSON.stringify(jCard)
 		};
 	}
@@ -318,4 +299,9 @@ export class ContactModel extends AbstractModel {
 			+ (this.checked() ? ' checked' : '')
 			+ (this.focused() ? ' focused' : '');
 	}
+
+	sendToAllDisplayStatus() {
+		return this.email.length > 1
+	}
+
 }

dev/Model/Email.js

@@ -4,271 +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 === ';')) {
-			address.length && addresses.push(address);
-			address = [];
-		} else {
-			address.push(token);
-		}
-	});
-
-	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();
-			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();
 	}
 
 	/**
@@ -278,61 +25,34 @@ export class EmailModel extends AbstractModel {
 	 */
 	static reviveFromJson(json) {
 		const email = super.reviveFromJson(json);
-		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
 	 * @returns {string}
 	 */
 	toLine(friendlyView, wrapWithLink) {
-		let result = this.email,
-			name = this.name,
+		let name = this.name,
+			result = this.email,
 			toLink = text =>
 				'<a href="mailto:'
 				+ encodeHtml(result) + (name ? '?to=' + encodeURIComponent('"' + name + '" <' + result + '>') : '')
@@ -351,47 +71,11 @@ export class EmailModel extends AbstractModel {
 				result = toLink();
 			}
 		}
-		return result;
+		return result || name;
 	}
 
-	static splitEmailLine(line) {
-		const result = [];
-		let exists = false;
-		addressparser(line).forEach(item => {
-			const address = item.address
-				? new EmailModel(item.address.replace(/^[<]+(.*)[>]+$/g, '$1'), item.name || '')
-				: null;
-
-			if (address?.email) {
-				exists = true;
-			}
-
-			result.push(address ? address.toLine() : item.name);
-		});
-		return exists ? result : null;
-	}
-
-	static parseEmailLine(line) {
-		return addressparser(line).map(item =>
-			item.address ? new EmailModel(item.address.replace(/^[<]+(.*)[>]+$/g, '$1'), item.name || '') : null
-		).filter(v => v);
-	}
-
-	/**
-	 * @param {string} emailAddress
-	 * @returns {boolean}
-	 */
-	parse(emailAddress) {
-		emailAddress = emailAddress.trim();
-		if (emailAddress) {
-			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('@'))
 	}
 }

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,6 +15,16 @@ 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
@@ -21,4 +33,43 @@ export class EmailCollectionModel extends AbstractCollectionModel
 	toString(friendlyView, wrapWithLink) {
 		return this.map(email => email.toLine(friendlyView, wrapWithLink)).join(', ');
 	}
+
+	/**
+	 * @param {string} text
+	 */
+	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);
+			}
+		});
+	}
+*/
+
 }

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 } from 'Common/Cache';
+import { clearCache, getFolderFromCacheList, setFolder, setFolderInboxName } from 'Common/Cache';
 import { Settings, SettingsGet, fireEvent } from 'Common/Globals';
 
 import * as Local from 'Storage/Client';
@@ -18,14 +18,21 @@ import { i18n, translateTrigger } from 'Common/Translator';
 
 import { AbstractModel } from 'Knoin/AbstractModel';
 
-import { koComputable, addObservablesTo } 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
@@ -91,12 +98,13 @@ export const
 		Remote.abort('Folders')
 			.post('Folders', FolderUserStore.foldersLoading)
 			.then(data => {
+				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
@@ -109,6 +117,8 @@ export class FolderCollectionModel extends AbstractCollectionModel
 		this.namespace;
 		this.optimized
 		this.capabilities
+		this.allow; // allow adding
+//		this.exist;
 	}
 */
 
@@ -124,11 +134,11 @@ export class FolderCollectionModel extends AbstractCollectionModel
 		);
 
 		const result = super.reviveFromJson(object, oFolder => {
-			let oCacheFolder = getFolderFromCacheList(oFolder.FullName);
+			let oCacheFolder = getFolderFromCacheList(oFolder.fullName);
 			if (oCacheFolder) {
 //				oCacheFolder.revivePropertiesFromJson(oFolder);
-				if (oFolder.Hash) {
-					oCacheFolder.hash = oFolder.Hash;
+				if (oFolder.etag) {
+					oCacheFolder.etag = oFolder.etag;
 				}
 				if (null != oFolder.totalEmails) {
 					oCacheFolder.totalEmails(oFolder.totalEmails);
@@ -167,32 +177,32 @@ export class FolderCollectionModel extends AbstractCollectionModel
 						break;
 				}
 				// Flags
-				if (oFolder.Flags.includes('\\sentmail')) {
+				if (oFolder.attributes.includes('\\sentmail')) {
 					role = 'sent';
 				}
-				if (oFolder.Flags.includes('\\spam')) {
+				if (oFolder.attributes.includes('\\spam')) {
 					role = 'junk';
 				}
-				if (oFolder.Flags.includes('\\bin')) {
+				if (oFolder.attributes.includes('\\bin')) {
 					role = 'trash';
 				}
-				if (oFolder.Flags.includes('\\important')) {
+				if (oFolder.attributes.includes('\\important')) {
 					role = 'important';
 				}
-				if (oFolder.Flags.includes('\\starred')) {
+				if (oFolder.attributes.includes('\\starred')) {
 					role = 'flagged';
 				}
-				if (oFolder.Flags.includes('\\all') || oFolder.Flags.includes('\\allmail')) {
+				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);
+				SystemFolders[role] || (SystemFolders[role] = oFolder.fullName);
 			}
 
-			oCacheFolder.type(FolderType[getKeyByValue(SystemFolders, oFolder.FullName)] || 0);
+			oCacheFolder.type(FolderType[getKeyByValue(SystemFolders, oFolder.fullName)] || 0);
 
 			oCacheFolder.collapsed(!expandedFolders
 				|| !isArray(expandedFolders)
@@ -221,14 +231,13 @@ export class FolderCollectionModel extends AbstractCollectionModel
 									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,
-										Exists: false,
-										isSubscribed: false,
-										Flags: ['\\nonexistent']
+										name: name,
+										fullName: parentName,
+										delimiter: delimiter,
+										attributes: ['\\nonexistent']
 									});
 									setFolder(pfolder);
 									result.splice(i, 0, pfolder);
@@ -251,6 +260,10 @@ export class FolderCollectionModel extends AbstractCollectionModel
 		return result;
 	}
 
+	visible() {
+		return this.filter(folder => folder.visible());
+	}
+
 	storeIt() {
 		FolderUserStore.displaySpecSetting(Settings.app('folderSpecLimit') < this.CountRec);
 
@@ -270,11 +283,9 @@ export class FolderCollectionModel extends AbstractCollectionModel
 		FolderUserStore.namespace = this.namespace;
 
 		// 'THREAD=REFS', 'THREAD=REFERENCES', 'THREAD=ORDEREDSUBJECT'
-		AppUserStore.threadsAllowed(!!(
-			Settings.app('useImapThread') && this.capabilities.some(capa => capa.startsWith('THREAD='))
-		));
+		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);
@@ -295,6 +306,7 @@ export class FolderModel extends AbstractModel {
 		super();
 
 		this.fullName = '';
+		this.parentName = '';
 		this.delimiter = '';
 		this.deep = 0;
 		this.expires = 0;
@@ -302,9 +314,10 @@ export class FolderModel extends AbstractModel {
 
 		this.exists = true;
 
-		this.hash = '';
-//		this.id = null;
-		this.uidNext = null;
+		this.etag = '';
+		this.id = 0;
+		this.uidNext = 0;
+		this.size = 0;
 
 		addObservablesTo(this, {
 			name: '',
@@ -314,16 +327,14 @@ export class FolderModel extends AbstractModel {
 
 			focused: false,
 			selected: false,
-			editing: false,
 			isSubscribed: true,
 			checkable: false, // Check for new messages
 			askDelete: false,
 
-			nameForEdit: '',
 			errorMsg: '',
 
-			totalEmailsValue: 0,
-			unreadEmailsValue: 0,
+			totalEmails: 0,
+			unreadEmails: 0,
 
 			kolabType: null,
 
@@ -332,17 +343,19 @@ export class FolderModel extends AbstractModel {
 			tagsAllowed: false
 		});
 
-		this.flags = ko.observableArray();
+		this.attributes = ko.observableArray();
+		// For messages
 		this.permanentFlags = ko.observableArray();
 
 		this.addSubscribables({
 			kolabType: sValue => this.metadata[FolderMetadataKeys.KolabFolderType] = sValue,
-			permanentFlags: aValue => this.tagsAllowed(aValue.includes('\\*'))
+			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 =>
@@ -356,20 +369,132 @@ export class FolderModel extends AbstractModel {
 					isPosNumeric(value) ? this.unreadEmailsValue(value) : this.unreadEmailsValue.valueHasMutated()
 			})
 			.extend({ notify: 'always' });
-/*
-		https://www.rfc-editor.org/rfc/rfc8621.html#section-2
-		"myRights": {
-			"mayAddItems": true,
-			"mayRename": false,
-			"maySubmit": true,
-			"mayDelete": false,
-			"maySetKeywords": true,
-			"mayRemoveItems": true,
-			"mayCreateChild": true,
-			"maySetSeen": true,
-			"mayReadItems": true
-		},
 */
+/*
+		// 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]);
 	}
 
 	/**
@@ -389,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]
 					|| ''
@@ -398,105 +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.addComputables({
-
-				isInbox: () => FolderType.Inbox === folder.type(),
-
-				isFlagged: () => FolderUserStore.currentFolder() === folder
-					&& MessagelistUserStore.listSearch().includes('flagged'),
-
-				hasVisibleSubfolders: () => !!folder.subFolders().find(folder => folder.visible()),
-
-				hasSubscriptions: () => folder.isSubscribed() | !!folder.subFolders().find(
-						oFolder => {
-							const subscribed = oFolder.hasSubscriptions();
-							return !oFolder.isSystemFolder() && subscribed;
-						}
-					),
-
-				canBeEdited: () => !folder.type() && folder.exists/* && folder.selectable()*/,
-
-				isSystemFolder: () => folder.type()
-					| (FolderUserStore.allowKolab() && !!folder.kolabType() & !SettingsUserStore.unhideKolabFolders()),
-
-				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()
-				 * - isSubscribed() OR hideUnsubscribed = false
-				 * - 0 == type()
-				 * - not kolabType()
-				 */
-				visible: () => {
-					const selectable = folder.canBeSelected(),
-						name = folder.name(),
-						filter = foldersFilter(),
-						visible = (folder.isSubscribed() | !SettingsUserStore.hideUnsubscribed())
-							&& selectable
-							&& (!filter || name.toLowerCase().includes(filter.toLowerCase()));
-					return folder.hasVisibleSubfolders() | visible;
-				},
-
-				printableUnreadCount: () => folder.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 = folder.unreadEmails(),
-						type = folder.type();
-//					return ((!folder.isSystemFolder() || type == FolderType.Inbox) && unread) ? unread : null;
-				},
-*/
-
-				localName: () => {
-					let name = folder.name();
-					if (folder.isSystemFolder()) {
-						translateTrigger();
-						name = getSystemFolderName(folder.type(), name);
-					}
-					return name;
-				},
-
-				manageFolderSystemName: () => {
-					if (folder.isSystemFolder()) {
-						translateTrigger();
-						let suffix = getSystemFolderName(folder.type(), getKolabFolderName(folder.kolabType()));
-						if (folder.name() !== suffix && 'inbox' !== suffix.toLowerCase()) {
-							return '(' + suffix + ')';
-						}
-					}
-					return '';
-				},
-
-				hasSubscribedUnreadMessagesSubfolders: () =>
-					!!folder.subFolders().find(
-						folder => folder.printableUnreadCount() | folder.hasSubscribedUnreadMessagesSubfolders()
-					)
-/*
-					!!folder.subFolders().filter(
-						folder => folder.printableUnreadCount() | folder.hasSubscribedUnreadMessagesSubfolders()
-					).length
-*/
-//				,href: () => folder.canBeSelected() && mailBox(folder.fullNameHash)
-			});
-
-			folder.addSubscribables({
-				editing: value => value && folder.nameForEdit(folder.name()),
-
-				unreadEmails: unread => FolderType.Inbox === folder.type() && fireEvent('mailbox.inbox-unread-count', unread)
-			});
 		}
 		return folder;
 	}

dev/Model/Identity.js

@@ -1,36 +1,52 @@
-import { AbstractModel } from 'Knoin/AbstractModel';
-import { addObservablesTo } from 'External/ko';
+//import { AbstractModel } from 'Knoin/AbstractModel';
+import { EmailModel } from 'Model/Email';
+import { addObservablesTo, addComputablesTo } from 'External/ko';
 
-export class IdentityModel extends AbstractModel {
-	/**
-	 * @param {string} id
-	 * @param {string} email
-	 */
-	constructor(id, email) {
+export class IdentityModel extends EmailModel /*AbstractModel*/ {
+	constructor() {
 		super();
 
 		addObservablesTo(this, {
-			id: id || '',
-			email: email,
-			name: '',
+			id: '',
+			label: '',
+//			email: '',
+//			name: '',
 
 			replyTo: '',
 			bcc: '',
+			sentFolder: '',
 
 			signature: '',
 			signatureInsertBefore: false,
 
-			askDelete: false
+			pgpSign: false,
+			pgpEncrypt: false,
+
+			smimeKey: '',
+			smimeCertificate: '',
+			smimeCertificateChain: '',
+
+			askDelete: false,
+
+			exists: false
+		});
+
+		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})` : '');
 	}
 }

dev/Model/MessageCollection.js

@@ -1,9 +1,6 @@
 import { AbstractCollectionModel } from 'Model/AbstractCollection';
 import { MessageModel } from 'Model/Message';
-
-import {
-	MessageFlagsCache
-} from 'Common/Cache';
+import { MessageUserStore } from 'Stores/User/Message';
 
 'use strict';
 
@@ -12,18 +9,16 @@ export class MessageCollectionModel extends AbstractCollectionModel
 /*
 	constructor() {
 		super();
-		this.Filtered
-		this.Folder
-		this.FolderHash
-		this.FolderInfo
+		this.filtered
+		this.folder
 		this.totalEmails
-		this.unreadEmails
-		this.UidNext
-		this.ThreadUid
-		this.NewMessages
-		this.Offset
-		this.Limit
-		this.Search
+		this.totalThreads
+		this.threadUid
+		this.newMessages
+		this.offset
+		this.limit
+		this.search
+		this.limited
 	}
 */
 
@@ -31,14 +26,17 @@ export class MessageCollectionModel extends AbstractCollectionModel
 	 * @param {?Object} json
 	 * @returns {MessageCollectionModel}
 	 */
-	static reviveFromJson(object, cached) {
+	static reviveFromJson(object/*, cached*/) {
+		let msg = MessageUserStore.message();
 		return super.reviveFromJson(object, message => {
-			message = MessageModel.reviveFromJson(message);
-			if (message) {
-				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;
 		});
 	}
 }

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();
+	}
+}

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-----';
+	}
+}

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);
+	}
+
+}

dev/Remote/AbstractFetch.js

@@ -1,4 +1,4 @@
-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';
@@ -8,19 +8,18 @@ let iJsonErrorCount = 0;
 const getURL = (add = '') => serverRequest('Json') + pString(add),
 
 checkResponseError = data => {
-	const err = data ? data.ErrorCode : null;
-	if (Notification.InvalidToken === err) {
-		console.error(getNotification(err));
+	const err = data ? data.code : null;
+	if (Notifications.InvalidToken === err) {
+		console.error(getNotification(err) + ` (${data.messageAdditional})`);
 //		alert(getNotification(err));
-		rl.logoutReload();
+		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) {
@@ -32,10 +31,11 @@ checkResponseError = data => {
 oRequests = {},
 
 abort = (sAction, sReason, bClearOnly) => {
-	if (oRequests[sAction]) {
-		bClearOnly || oRequests[sAction].abort(sReason || 'AbortError');
-		oRequests[sAction] = null;
-		delete oRequests[sAction];
+	let controller = oRequests[sAction];
+	oRequests[sAction] = null;
+	if (controller) {
+		clearTimeout(controller.timeoutId);
+		bClearOnly || controller.abort(new DOMException(sAction, sReason || 'AbortError'));
 	}
 },
 
@@ -48,15 +48,18 @@ fetchJSON = (action, sUrl, params, timeout, jsonCallback) => {
 		}
 	}
 	// Don't abort, read https://github.com/the-djmaze/snappymail/issues/487
-//	abort(action);
+//	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
-	timeout && setTimeout(() => abort(action, 'TimeoutError'), timeout);
-	return rl.fetchJSON(sUrl, {signal: signal}, params).then(jsonCallback).catch(err => {
+	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;
-		err.reason = signal.reason;
 		return Promise.reject(err);
 	});
 };
@@ -65,14 +68,14 @@ class FetchError extends Error
 {
 	constructor(code, message) {
 		super(message);
-		this.code = code || Notification.JsonFalse;
+		this.code = code || Notifications.JsonFalse;
 	}
 }
 
 export class AbstractFetchRemote
 {
-	abort(sAction) {
-		abort(sAction);
+	abort(sAction, sReason) {
+		abort(sAction, sReason);
 		return this;
 	}
 
@@ -128,19 +131,10 @@ export class AbstractFetchRemote
 
 		fetchJSON(sAction, getURL(sGetAdd),
 			sGetAdd ? null : (params || {}),
-			undefined === iTimeout ? 30000 : pInt(iTimeout),
-			data => {
-				let cached = false;
-				if (data?.Time) {
-					cached = pInt(data.Time) > Date.now() - start;
-				}
-
+			pInt(iTimeout ?? 30000),
+			async data => {
 				let iError = 0;
-				if (sAction && oRequests[sAction]) {
-					abort(sAction, 0, 1);
-				}
-
-				if (!iError && data) {
+				if (data) {
 /*
 					if (sAction !== data.Action) {
 						console.log(sAction + ' !== ' + data.Action);
@@ -150,35 +144,35 @@ 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({fetchError:err});
 			fCallback && fCallback(
-				'TimeoutError' == err.reason ? 3 : (err.name == 'AbortError' ? 2 : 1),
+				'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;
@@ -195,16 +189,20 @@ export class AbstractFetchRemote
 	post(action, fTrigger, params, timeOut) {
 		this.setTrigger(fTrigger, true);
 		return fetchJSON(action, getURL(), params || {}, pInt(timeOut, 30000),
-			data => {
+			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?.Time) {
-					isCached = pInt(data.Time) > microtime() - start;
+				if (data?.epoch) {
+					isCached = data.epoch > microtime() - start;
 				}
 				// backward capability
 				switch (true) {
@@ -224,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) : ''
 					));
 				}
 

dev/Remote/User/Fetch.js

@@ -9,57 +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),
-			folder = getFolderFromCacheList(sFolderFullName),
-			folderHash = folder?.hash || '';
-
-		params = Object.assign({
-			Offset: 0,
-			Limit: SettingsUserStore.messagesPerPage(),
-			Search: '',
-			UidNext: folder?.uidNext || 0, // 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 = {};
-		}
-
-		bSilent || this.abort('MessageList');
-		this.request('MessageList',
-			fCallback,
-			params,
-			60000, // 60 seconds before aborting
-			sGetAdd
-		);
-	}
-
 	/**
 	 * @param {?Function} fCallback
 	 * @param {string} sFolderFullName
@@ -82,7 +36,7 @@ class RemoteUserFetch extends AbstractFetchRemote {
 						sFolderFullName,
 						iUid,
 						AppUserStore.threadsAllowed() && SettingsUserStore.useThreads() ? 1 : 0,
-						SettingsGet('AccountHash')
+						SettingsGet('accountHash')
 					])
 			);
 
@@ -110,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();

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?.(viewModelDom);
+
+				fireEvent('rl-view-model', settingsScreen);
 			} else {
 				console.log('Cannot find sub settings view model position: SettingsSubScreen');
 			}
@@ -68,13 +75,13 @@ export class AbstractSettingsScreen extends AbstractScreen {
 
 					// show
 					settingsScreen.beforeShow?.();
-					i18nToNodes(settingsScreen.viewModelDom);
-					settingsScreen.viewModelDom.hidden = false;
+					i18nToNodes(viewModelDom);
+					viewModelDom.hidden = false;
 					settingsScreen.onShow?.();
 
 					this.menu.forEach(item => {
 						item.selected(
-							item.route === RoutedSettingsViewModel.__rlSettingsData.route
+							item.route === RoutedSettingsViewModel.route
 						);
 					});
 
@@ -96,19 +103,21 @@ export class AbstractSettingsScreen extends AbstractScreen {
 	}
 
 	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);
+	});
 }

dev/Screen/User/MailBox.js

@@ -1,17 +1,14 @@
-import { Scope } from 'Common/Enums';
-import { Layout, ClientSideKeyNameMessageListSize } from 'Common/EnumsUser';
-import { doc, createElement, leftPanelDisabled, 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, moveAction } from 'Common/UtilsUser';
-import { getFolderFromCacheList, getFolderFullName, getFolderInboxName } from 'Common/Cache';
+import { moveAction } from 'Common/UtilsUser';
+import { getFolderFromHashMap, getFolderInboxName } from 'Common/Cache';
 import { i18n, initOnStartOrLangChange } from 'Common/Translator';
-import { SettingsUserStore } from 'Stores/User/Settings';
 
 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';
@@ -59,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);
 	}
 
 	/**
@@ -73,7 +67,8 @@ export class MailBoxUserScreen extends AbstractScreen {
 	 * @returns {void}
 	 */
 	onRoute(folderHash, page, search, messageUid) {
-		const folder = getFolderFromCacheList(getFolderFullName(folderHash.replace(/~([\d]+)$/, '')));
+		// Only works when FolderUserStore.folderList() is loaded
+		const folder = getFolderFromHashMap(folderHash.replace(/~([\d]+)$/, ''));
 		if (folder) {
 			FolderUserStore.currentFolder(folder);
 			MessagelistUserStore.page(1 > page ? 1 : page);
@@ -113,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)
 		);
 	}
 

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,6 +36,8 @@ 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);
 		}
@@ -66,8 +67,7 @@ export class SettingsUserScreen extends AbstractSettingsScreen {
 
 	onShow() {
 		this.setSettingsTitle();
-		keyScope(Scope.Settings);
-		ThemeStore.isMobile() && leftPanelDisabled(true);
+		keyScope(ScopeSettings);
 	}
 
 	setSettingsTitle() {

dev/Settings/Admin/About.js

@@ -16,6 +16,10 @@ 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 });
@@ -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?.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);

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');
 	}
 }

dev/Settings/Admin/Config.js

@@ -2,12 +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() {
@@ -28,13 +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);

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',
@@ -90,10 +98,14 @@ export class AdminSettingsContacts extends AbstractViewSettings {
 
 				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()
 			}
 		);
 	}

dev/Settings/Admin/Domains.js

@@ -16,17 +16,16 @@ export class AdminSettingsDomains /*extends AbstractViewSettings*/ {
 	}
 
 	testUsername() {
-		// TODO: find domain matching username
 		Remote.request('AdminDomainMatch',
 			(iError, oData) => {
-				if (oData?.Result?.domain) {
-					alert(`${oData.Result.email} matched domain: ${oData.Result.domain.name}`);
+				if (oData?.Result?.name) {
+					alert(`${oData.Result.email} matched domain: ${oData.Result.name}`);
 				} else {
 					alert('No domain match');
 				}
 			},
 			{
-				username: this.username()
+				username: this.username
 			}
 		);
 	}
@@ -42,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
 		});
 	}
 
@@ -60,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
 				}
 			);
 

dev/Settings/Admin/General.js

@@ -1,13 +1,9 @@
 import ko from 'ko';
 
-import {
-	isArray
-} from 'Common/Utils';
-
 import { addObservablesTo, addSubscribablesTo, addComputablesTo } from 'External/ko';
 
 import { SaveSettingStatus } from 'Common/Enums';
-import { Settings, SettingsGet, SettingsCapa } from 'Common/Globals';
+import { SettingsAdmin, SettingsGet, SettingsCapa } from 'Common/Globals';
 import { translatorReload, convertLangName } from 'Common/Translator';
 
 import { AbstractViewSettings } from 'Knoin/AbstractViews';
@@ -24,20 +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'));
+		this.languageAdmin = ko.observable(SettingsAdmin('language'));
 
 		this.theme = ThemeStore.theme;
 		this.themes = ThemeStore.themes;
 
-		this.addSettings(['AllowLanguagesOnSettings']);
+		this.addSettings(['allowLanguagesOnSettings']);
 
 		addObservablesTo(this, {
-			attachmentLimitTrigger: SaveSettingStatus.Idle,
-			themeTrigger: SaveSettingStatus.Idle,
 			capaThemes: SettingsCapa('Themes'),
 			capaUserBackground: SettingsCapa('UserBackground'),
 			capaAdditionalAccounts: SettingsCapa('AdditionalAccounts'),
@@ -55,14 +45,14 @@ 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?.upload_max_filesize || this.uploadData?.post_max_size)
 				? [
@@ -91,9 +81,9 @@ export class AdminSettingsGeneral extends AbstractViewSettings {
 		addSubscribablesTo(this, {
 			languageAdmin: value => {
 				this.languageAdminTrigger(SaveSettingStatus.Saving);
-				translatorReload(true, value)
+				translatorReload(value, 1)
 					.then(fReloadLanguageHelper(SaveSettingStatus.Success), fReloadLanguageHelper(SaveSettingStatus.Failed))
-					.then(() => Remote.saveSetting('LanguageAdmin', value));
+					.then(() => Remote.saveSetting('languageAdmin', value));
 			},
 
 			capaAdditionalAccounts: fSaveHelper('CapaAdditionalAccounts'),
@@ -109,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')
 		]);
 	}
 }