diff --git a/Dockerfile b/Dockerfile
index f692120..cdde806 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,18 @@
+FROM alpine:3.10 AS builder
+
+ENV VERSION=1.4-rc1
+ENV SHA256_SUM=24a6c8ba9dcd4105f578fba1fadef27c878693612b74d8b781f98ac89de3285c
+RUN wget https://github.com/roundcube/roundcubemail/releases/download/$VERSION/roundcubemail-$VERSION-complete.tar.gz
+RUN echo "$SHA256_SUM  roundcubemail-$VERSION-complete.tar.gz" | sha256sum -c - || exit 1
+RUN mkdir -p /var/lib/roundcube
+RUN tar xzf roundcubemail-$VERSION-complete.tar.gz -C /var/lib/roundcube --strip 1
+
 FROM thallian/php7-fpm:latest
 
-ENV VERSION 1.3.6
+COPY --from=builder /var/lib/roundcube /var/lib/roundcube
 
 RUN apk add --no-cache \
-    libressl \
+    openssl \
     tar \
     nginx \
     postgresql-client \
@@ -29,8 +38,6 @@ RUN apk add --no-cache \
     php7-pspell \
     php7-apcu
 
-RUN mkdir /var/lib/roundcube
-RUN wget -qO- https://github.com/roundcube/roundcubemail/releases/download/$VERSION/roundcubemail-$VERSION-complete.tar.gz | tar xz -C /var/lib/roundcube --strip 1
 RUN chown -R nginx:nginx /var/lib/roundcube
 
 RUN mkdir /run/nginx
diff --git a/rootfs/etc/confd/templates/config.inc.php.tmpl b/rootfs/etc/confd/templates/config.inc.php.tmpl
index 4079669..fe1f7f2 100644
--- a/rootfs/etc/confd/templates/config.inc.php.tmpl
+++ b/rootfs/etc/confd/templates/config.inc.php.tmpl
@@ -6,6 +6,8 @@ $config['db_dsnw'] = 'pgsql://{{getenv "DB_USER"}}:{{getenv "DB_PASSWORD"}}@{{ge
 $config['log_driver'] = 'syslog';
 $config['syslog_facility'] = LOG_USER;
 
+$config['skin'] = 'elastic';
+
 $config['default_host'] = '{{getenv "IMAP_HOST" "tls://%n"}}';
 $config['imap_conn_options'] = array(
   'ssl'         => array(