diff --git a/base.yml b/base.yml
index dc4daba9bd66098fa8e323e088ae91c09a4a8f39..57428f6b04785ea9ef54e611c2564edd1d150ac0 100755
--- a/base.yml
+++ b/base.yml
@@ -83,3 +83,4 @@
 - import_playbook: plays/owncloud.yml
 - import_playbook: plays/etherpad.yml
 - import_playbook: plays/reverse-proxy.yml
+- import_playbook: plays/roundcube.yml
diff --git a/roles/roundcube/tasks/main.yml b/roles/roundcube/tasks/main.yml
index 6abed6e86cd4e627025f173befb94d949be22958..493a8b08809859665399d875590e7119c1cfcd27 100644
--- a/roles/roundcube/tasks/main.yml
+++ b/roles/roundcube/tasks/main.yml
@@ -12,6 +12,7 @@
       - php-fpm
       - php-gd
       - php-pspell
+      - php-pgsql
   register: apt_result
   retries: 3
   until: apt_result is succeeded
diff --git a/roles/roundcube/templates/nginx/roundcube.j2 b/roles/roundcube/templates/nginx/roundcube.j2
index 0321654b0a5bb37442c7dc452a3eace31efef0db..68992ae3515392a5ee5ce9509a6e671b94656bae 100644
--- a/roles/roundcube/templates/nginx/roundcube.j2
+++ b/roles/roundcube/templates/nginx/roundcube.j2
@@ -16,7 +16,7 @@ server {
         fastcgi_buffer_size 128k;
         fastcgi_buffers 4 256k;
         fastcgi_busy_buffers_size 256k;
-        fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
+        fastcgi_pass unix:/var/run/php/php7.3-fpm.sock;
         include fastcgi_params;
     }
 
diff --git a/roles/roundcube/templates/roundcube/config.inc.php.j2 b/roles/roundcube/templates/roundcube/config.inc.php.j2
index 6225c8bcf1bd889827d6d1c2af437592a169eed7..7b1b79dbe5ecab1a28b5d52a223e9a6ad5f2383e 100644
--- a/roles/roundcube/templates/roundcube/config.inc.php.j2
+++ b/roles/roundcube/templates/roundcube/config.inc.php.j2
@@ -10,7 +10,7 @@
 | from defaults.inc.php to this file to override the defaults.          |
 |                                                                       |
 | This file is part of the Roundcube Webmail client                     |
-| Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+| Copyright (C) The Roundcube Dev Team                                  |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@@ -20,13 +20,14 @@
 
 $config = array();
 
-/* Do not set db_dsnw here, use dpkg-reconfigure roundcube-core to configure database ! */
+// Do not set db_dsnw here, use dpkg-reconfigure roundcube-core to configure database!
 include_once("/etc/roundcube/debian-db-roundcube.php");
 
 // The IMAP host chosen to perform the log-in.
 // Leave blank to show a textbox at login, give a list of hosts
 // to display a pulldown menu or set one host as string.
-// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls://
+// Enter hostname with prefix ssl:// to use Implicit TLS, or use
+// prefix tls:// to use STARTTLS.
 // Supported replacement variables:
 // %n - hostname ($_SERVER['SERVER_NAME'])
 // %t - hostname without the first part
@@ -38,8 +39,8 @@ $config['default_host'] = array(
 );
 
 // SMTP server host (for sending mails).
-// Enter hostname with prefix tls:// to use STARTTLS, or use
-// prefix ssl:// to use the deprecated SSL over SMTP (aka SMTPS)
+// Enter hostname with prefix ssl:// to use Implicit TLS, or use
+// prefix tls:// to use STARTTLS.
 // Supported replacement variables:
 // %h - user's IMAP hostname
 // %n - hostname ($_SERVER['SERVER_NAME'])
@@ -49,16 +50,27 @@ $config['default_host'] = array(
 // For example %n = mail.domain.tld, %t = domain.tld
 $config['smtp_server'] = 'smtp.adm.crans.org';
 
-// Use roundcube username as SMTP user
+// SMTP port. Use 25 for cleartext, 465 for Implicit TLS, or 587 for STARTTLS (default)
+$config['smtp_port'] = 25;
+
+// SMTP username (if required) if you use %u as the username Roundcube
+// will use the current username for login
 $config['smtp_user'] = '%u';
 
 // SMTP password (if required) if you use %p as the password Roundcube
 // will use the current user's password for login
 $config['smtp_pass'] = '';
 
+// provide an URL where a user can get support for this Roundcube installation
+// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE!
+$config['support_url'] = '';
+
+// Name your service. This is displayed on the login screen and in the window title
+$config['product_name'] = 'Crans Webmail';
+
 // This key is used to encrypt the users imap password which is stored
-// in the session record (and the client cookie if remember password is enabled).
-// please provide a string of exactly 24 chars.
+// in the session record. For the default cipher method it must be
+// exactly 24 characters long.
 // YOUR KEY MUST BE DIFFERENT THAN THE SAMPLE VALUE FOR SECURITY REASONS
 $config['des_key'] = '{{ roundcube_des_key }}';
 
@@ -72,10 +84,10 @@ $config['plugins'] = array(
 );
 
 // skin name: folder from skins/
-$config['skin'] = 'larry';
+$config['skin'] = 'elastic';
 
 // Disable spellchecking
-// Debian: spellshecking needs additional packages to be installed, or calling external APIs
+// Debian: spellchecking needs additional packages to be installed, or calling external APIs
 //         see defaults.inc.php for additional informations
 $config['enable_spellcheck'] = false;