diff --git a/roles/ispmail-webmail-apache/tasks/main.yml b/roles/ispmail-webmail-apache/tasks/main.yml
index 0f0cc09..8d3bd1a 100644
--- a/roles/ispmail-webmail-apache/tasks/main.yml
+++ b/roles/ispmail-webmail-apache/tasks/main.yml
@@ -1,16 +1,18 @@
-- name: install required binary packages
+- name: Install required binary packages
   apt: name={{item}} state=installed
   with_items:
   - apache2
   - libapache2-mod-php5
   notify: restart apache
-- name: Create Apache vhost configuration for Webmail
-  template: src=webmail.conf.j2 dest=/etc/apache2/sites-available/webmail.conf
+- name: Create Apache vhost configuration for HTTPS (RoundCube and PHPmyadmin)
+  template: src=webmail.conf-443.j2 dest=/etc/apache2/sites-available/default-ssl.conf
   notify: restart apache
-- name: Enable Apache vhost
-  command: /usr/sbin/a2ensite webmail.conf creates=/etc/apache2/sites-enabled/webmail.conf
+- name: Enable Apache vhost for HTTPS
+  command: /usr/sbin/a2ensite default-ssl creates=/etc/apache2/sites-enabled/default-ssl.conf
   notify: restart apache
-- name: Enabling Apache SSL module
+- name: Create Apache vhost configuration for HTTP (redirect to HTTPS)
+  template: src=webmail.conf-80.j2 dest=/etc/apache2/sites-available/000-default.conf
+  notify: restart apache
+- name: Enable Apache SSL module
   command: /usr/sbin/a2enmod ssl creates=/etc/apache2/mods-enabled/ssl.conf
   notify: restart apache
-
diff --git a/roles/ispmail-webmail-apache/templates/webmail.conf.j2 b/roles/ispmail-webmail-apache/templates/webmail.conf-443.j2
similarity index 98%
rename from roles/ispmail-webmail-apache/templates/webmail.conf.j2
rename to roles/ispmail-webmail-apache/templates/webmail.conf-443.j2
index 9aa7cd1..6019705 100644
--- a/roles/ispmail-webmail-apache/templates/webmail.conf.j2
+++ b/roles/ispmail-webmail-apache/templates/webmail.conf-443.j2
@@ -1,11 +1,10 @@
 <IfModule mod_ssl.c>
 	<VirtualHost _default_:443>
-		ServerAdmin webmaster@localhost
+		ServerAdmin {{ ispmail_postmaster_address }}
 		ServerName {{ ispmail_webmail_hostname }}
 
-		#DocumentRoot /var/www/html
 		Include /etc/roundcube/apache.conf
-		Alias /roundcube /var/lib/roundcube
+		Alias / /var/lib/roundcube/
 
 		# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
 		# error, crit, alert, emerg.
diff --git a/roles/ispmail-webmail-apache/templates/webmail.conf-80.j2 b/roles/ispmail-webmail-apache/templates/webmail.conf-80.j2
new file mode 100644
index 0000000..59589bc
--- /dev/null
+++ b/roles/ispmail-webmail-apache/templates/webmail.conf-80.j2
@@ -0,0 +1,6 @@
+<VirtualHost *:80>
+	ServerAdmin {{ ispmail_postmaster_address }}
+	ServerName {{ ispmail_webmail_hostname }}
+
+	Redirect permanent / https://{{ ispmail_webmail_hostname}}/
+</VirtualHost>