diff --git a/roles/mail_server/defaults/main.yml b/roles/mail_server/defaults/main.yml
index 7c198d9772e9a5944bef9987fd449670b8580633..7eb533e1130ab5cf3c08d87b63c7ac41fa255a64 100644
--- a/roles/mail_server/defaults/main.yml
+++ b/roles/mail_server/defaults/main.yml
@@ -10,7 +10,12 @@ local_mail_aliases: {}
 imap_max_user_connections_per_ip: 10
 mail_server_tls_protocols:
   - "TLSv1.2"
-mail_server_tls_ciphers: "DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-GCM-SHA384:\
-DHE-RSA-AES256-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-GCM-SHA384:\
-ECDHE-RSA-AES256-SHA384:!aNULL:!MD5:!EXPORT"
+mail_server_tls_ciphers: "\
+DHE-RSA-AES128-GCM-SHA256:\
+DHE-RSA-AES256-GCM-SHA384:\
+DHE-RSA-CHACHA20-POLY1305:\
+ECDHE-RSA-AES128-GCM-SHA256:\
+ECDHE-RSA-AES256-GCM-SHA384:\
+ECDHE-RSA-CHACHA20-POLY1305:\
+!aNULL:!MD5:!EXPORT"
 mail_message_size_limit: 10240000