diff --git a/.env b/.env
index cff720ef..20df56ea 100644
--- a/.env
+++ b/.env
@@ -39,7 +39,7 @@ COMPOSE_PROJECT_NAME=freeposte
 # Choose which frontend Web server to run if any (value: nginx, none)
 FRONTEND=none
 
-# Choose which webmail to run if any (values: roundcube, none)
+# Choose which webmail to run if any (values: roundcube, rainloop, none)
 WEBMAIL=none
 
 ###################################
diff --git a/README.md b/README.md
index d3daff52..d84201e9 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Features
 Main features include:
 
 - **Standard email server**, IMAP and IMAP+, SMTP and Submission
-- **Web access**, Roundcube-based Webmail and adminitration interface
+- **Web access**, multiple Webmails and adminitration interface
 - **User features**, aliases, auto-reply, auto-forward, fetched accounts
 - **Admin features**, global admins, per-domain delegation, quotas
 - **Security**, enforced TLS, outgoing DKIM, anti-virus scanner
diff --git a/rainloop/Dockerfile b/rainloop/Dockerfile
new file mode 100644
index 00000000..46ba63fa
--- /dev/null
+++ b/rainloop/Dockerfile
@@ -0,0 +1,27 @@
+FROM php:5-apache
+
+RUN apt-get update && apt-get install -y \
+      unzip
+
+ENV RAINLOOP_URL https://github.com/RainLoop/rainloop-webmail/releases/download/v1.10.3.151/rainloop-community-1.10.3.151-aa8d0c41baec166a35bb9855ee3d07b9.zip
+
+RUN echo date.timezone=UTC > /usr/local/etc/php/conf.d/timezone.ini
+
+RUN cd /var/www/html \
+ && rm -rf ./* \
+ && curl -L -O ${RAINLOOP_URL} \
+ && unzip *.zip \
+ && rm -f *.zip \
+ && rm -rf data/ \
+ && find . -type d -exec chmod 755 {} \; \
+ && find . -type f -exec chmod 644 {} \; \
+ && chown -R www-data: *
+
+COPY include.php /var/www/html/include.php
+
+COPY config.ini /config.ini
+COPY default.ini /default.ini
+
+COPY start.sh /start.sh
+
+CMD ["/start.sh"]
diff --git a/rainloop/config.ini b/rainloop/config.ini
new file mode 100644
index 00000000..5baa09a7
--- /dev/null
+++ b/rainloop/config.ini
@@ -0,0 +1,7 @@
+; RainLoop Webmail configuration file
+
+[security]
+allow_admin_panel = Off
+
+[labs]
+allow_gravatar = Off
diff --git a/rainloop/default.ini b/rainloop/default.ini
new file mode 100644
index 00000000..7b49533e
--- /dev/null
+++ b/rainloop/default.ini
@@ -0,0 +1,15 @@
+imap_host = "imap"
+imap_port = 143
+imap_secure = "TLS"
+imap_short_login = Off
+sieve_use = Off
+sieve_allow_raw = Off
+sieve_host = ""
+sieve_port = 4190
+sieve_secure = "None"
+smtp_host = "smtp"
+smtp_port = 587
+smtp_secure = "TLS"
+smtp_short_login = Off
+smtp_auth = On
+smtp_php_mail = Off
diff --git a/rainloop/include.php b/rainloop/include.php
new file mode 100644
index 00000000..2376c683
--- /dev/null
+++ b/rainloop/include.php
@@ -0,0 +1,19 @@
+<?php
+
+// Rename this file to "include.php" to enable it.
+
+/**
+ * @return string
+ */
+function __get_custom_data_full_path()
+{
+	return '/data/'; // custom data folder path
+}
+
+/**
+ * @return string
+ */
+function __get_additional_configuration_name()
+{
+	return 'config.ini';
+}
diff --git a/rainloop/start.sh b/rainloop/start.sh
new file mode 100755
index 00000000..bd39e472
--- /dev/null
+++ b/rainloop/start.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Fix some permissions
+chown -R www-data:www-data /data
+
+# There is no cleaner way to setup the default SMTP/IMAP server or to
+# override the configuration
+rm -f /data/_data_/_default_/domains/*
+cp /default.ini /data/_data_/_default_/domains/
+cp /config.ini /data/_data_/_default_/configs/
+
+# Run apache
+exec apache2-foreground