diff --git a/quickstart.go b/quickstart.go
index c82aed2..dd4a123 100644
--- a/quickstart.go
+++ b/quickstart.go
@@ -744,6 +744,7 @@ many authentication failures).
 		hostbase := filepath.FromSlash("path/to/" + dnshostname.Name())
 		mtastsbase := filepath.FromSlash("path/to/mta-sts." + domain.Name())
 		autoconfigbase := filepath.FromSlash("path/to/autoconfig." + domain.Name())
+		mailbase := filepath.FromSlash("path/to/mail." + domain.Name())
 		public.TLS = &config.TLS{
 			KeyCerts: []config.KeyCert{
 				{CertFile: hostbase + "-chain.crt.pem", KeyFile: hostbase + ".key.pem"},
@@ -751,6 +752,9 @@ many authentication failures).
 				{CertFile: autoconfigbase + "-chain.crt.pem", KeyFile: autoconfigbase + ".key.pem"},
 			},
 		}
+		if mailbase != hostbase {
+			public.TLS.KeyCerts = append(public.TLS.KeyCerts, config.KeyCert{CertFile: mailbase + "-chain.crt.pem", KeyFile: mailbase + ".key.pem"})
+		}
 
 		fmt.Println(
 			`Placeholder paths to TLS certificates to be provided by the existing webserver