diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a8e68d0..79314c84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ Control panel:
* Explanatory text for setting up secondary nameserver is added/fixed.
* DNS checks now have a timeout in case a DNS server is not responding, so the checks don't stall indefinitely.
* Better messages if external DNS is used and, weirdly, custom secondary nameservers are set.
+* Add POP to the mail client settings documentation.
System:
diff --git a/management/templates/mail-guide.html b/management/templates/mail-guide.html
index edf9fefd..906e7b2a 100644
--- a/management/templates/mail-guide.html
+++ b/management/templates/mail-guide.html
@@ -29,7 +29,7 @@
| Protocol/Method | IMAP |
|---|
| Mail server | {{hostname}} |
|---|
| IMAP Port | 993 |
|---|
- | IMAP Security | SSL |
|---|
+ | IMAP Security | SSL or TLS |
|---|
| SMTP Port | 587 |
|---|
| SMTP Security | STARTTLS (“always” or “required”, if prompted) |
|---|
| Username: | Your whole email address. |
|---|
@@ -38,6 +38,8 @@
In addition to setting up your email, you’ll also need to set up contacts and calendar synchronization separately.
+ As an alternative to IMAP you can also use the POP protocol: choose POP as the protocol, port 995, and SSL or TLS security in your mail client. The SMTP settings and usernames and passwords remain the same. However, we recommend you use IMAP instead.
+
Exchange/ActiveSync settings
On iOS devices, devices on this compatibility list, or using Outlook 2007 or later on Windows 7 and later, you may set up your mail as an Exchange or ActiveSync server. However, we’ve found this to be more buggy than using IMAP as described above. If you encounter any problems, please use the manual settings above.