diff --git a/data/templates/dovecot/dovecot.conf b/data/templates/dovecot/dovecot.conf
index 00916d88d..af745c93d 100644
--- a/data/templates/dovecot/dovecot.conf
+++ b/data/templates/dovecot/dovecot.conf
@@ -1,15 +1,44 @@
 listen = *, ::
 auth_mechanisms = plain login
+
 mail_gid = 8
 mail_home = /var/mail/%n
 mail_location = maildir:/var/mail/%n
 mail_uid = 500
+
+protocols = imap sieve
+
+mail_plugins = $mail_plugins quota
+
+ssl = yes
+ssl_cert = </etc/yunohost/certs/{{ main_domain }}/crt.pem
+ssl_key = </etc/yunohost/certs/{{ main_domain }}/key.pem
+ssl_protocols = !SSLv2 !SSLv3
+
 passdb {
   args = /etc/dovecot/dovecot-ldap.conf
   driver = ldap
 }
-protocols = imap sieve
-mail_plugins = $mail_plugins quota
+
+userdb {
+  args = /etc/dovecot/dovecot-ldap.conf
+  driver = ldap
+}
+
+protocol imap {
+  imap_client_workarounds =
+  mail_plugins = $mail_plugins imap_quota antispam
+}
+
+protocol lda {
+  auth_socket_path = /var/run/dovecot/auth-master
+  mail_plugins = quota sieve
+  postmaster_address = postmaster@{{ main_domain }}
+}
+
+protocol sieve {
+}
+
 service auth {
   unix_listener /var/spool/postfix/private/auth {
     group = postfix
@@ -23,26 +52,11 @@ service auth {
   }
 }
 
-protocol sieve {
-}
-
-ssl = yes
-ssl_cert = </etc/yunohost/certs/{{ main_domain }}/crt.pem
-ssl_key = </etc/yunohost/certs/{{ main_domain }}/key.pem
-ssl_protocols = !SSLv2 !SSLv3
-
-userdb {
-  args = /etc/dovecot/dovecot-ldap.conf
-  driver = ldap
-}
-protocol imap {
-  imap_client_workarounds =
-  mail_plugins = $mail_plugins imap_quota antispam
-}
-protocol lda {
-  auth_socket_path = /var/run/dovecot/auth-master
-  mail_plugins = quota sieve
-  postmaster_address = postmaster@{{ main_domain }}
+service quota-warning {
+  executable = script /usr/bin/quota-warning.sh
+  user = vmail
+  unix_listener quota-warning {
+  }
 }
 
 plugin {
@@ -80,9 +94,3 @@ plugin {
   quota_warning3 = -storage=100%% quota-warning below %u # user is no longer over quota
 }
 
-service quota-warning {
-  executable = script /usr/bin/quota-warning.sh
-  user = vmail
-  unix_listener quota-warning {
-  }
-}