diff --git a/admin_manual/configuration_server/email_configuration.rst b/admin_manual/configuration_server/email_configuration.rst
index b7aeca93a..159c24a3f 100644
--- a/admin_manual/configuration_server/email_configuration.rst
+++ b/admin_manual/configuration_server/email_configuration.rst
@@ -168,7 +168,7 @@ the following two variants:
 SSL
 ^^^
 
-A secure connection will be initiated using the outdated SMTPS protocol
+A secure connection will be initiated using the SMTPS protocol
 which uses the port 465/tcp:
 
 ::
@@ -331,18 +331,20 @@ listening on localhost port 25.
 
 * 143/tcp/udp is unencrypted imap4
 
-* 465/tcp is encrypted ssmtp
+* 465/tcp is encrypted submissions
+
+* 587/tcp is opportunistically-encrypted submission
 
 * 993/tcp/udp is encrypted imaps
 
 * 995/tcp/udp is encrypted pop3s
 
 
-**Question**: How can I determine if the SMTP server supports the outdated SMTPS
+**Question**: How can I determine if the SMTP server supports the SMTPS
 protocol?
 
 **Answer**: A good indication that the SMTP server supports the SMTPS protocol
-is that it is listening on port **465**.
+is that it is listening on the `submissions` port **465**.
 
 **Question**: How can I determine what authorization and encryption protocols
 the mail server supports?