From f8b4e3775dcae3fee60579b8400ddc089548d7fb Mon Sep 17 00:00:00 2001
From: Marius <aspdye@web.de>
Date: Sat, 12 Dec 2015 13:35:12 +0100
Subject: [PATCH 1/2] Update mail-guide.html (POP3)

---
 management/templates/mail-guide.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/management/templates/mail-guide.html b/management/templates/mail-guide.html
index edf9fefd..d5a0c2ae 100644
--- a/management/templates/mail-guide.html
+++ b/management/templates/mail-guide.html
@@ -37,6 +37,7 @@
 					</table>
 
 					<p>In addition to setting up your email, you&rsquo;ll also need to set up <a href="#sync_guide" onclick="return show_panel(this);">contacts and calendar synchronization</a> separately.</p>
+					<p>As an alternative to IMAP you can also use the POP protocol. For this you just need to pick POP as the protocol in your e-mail client, and use the port 995. The SMTP settings and usernames and passwords remain the same. However, we strongly recommend to use IMAP or ActiveSync.</p>
 
 				<h4>Exchange/ActiveSync settings</h4>
 

From 6e6c9937246cec932691d71bdd8efc3eb2b69aa9 Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Sat, 12 Dec 2015 08:44:13 -0500
Subject: [PATCH 2/2] reword POP documentation, add to changelog/readme

---
 CHANGELOG.md                         | 1 +
 management/templates/mail-guide.html | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

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 d5a0c2ae..906e7b2a 100644
--- a/management/templates/mail-guide.html
+++ b/management/templates/mail-guide.html
@@ -29,7 +29,7 @@
 					<tr><th>Protocol/Method</th> <td>IMAP</td></tr>
 					<tr><th>Mail server</th> <td>{{hostname}}</td>
 					<tr><th>IMAP Port</th> <td>993</td></tr>
-					<tr><th>IMAP Security</th> <td>SSL</td></tr>
+					<tr><th>IMAP Security</th> <td>SSL or TLS</td></tr>
 					<tr><th>SMTP Port</th> <td>587</td></tr>
 					<tr><th>SMTP Security</td> <td>STARTTLS <small>(&ldquo;always&rdquo; or &ldquo;required&rdquo;, if prompted)</small></td></tr>
 					<tr><th>Username:</th> <td>Your whole email address.</td></tr>
@@ -37,7 +37,8 @@
 					</table>
 
 					<p>In addition to setting up your email, you&rsquo;ll also need to set up <a href="#sync_guide" onclick="return show_panel(this);">contacts and calendar synchronization</a> separately.</p>
-					<p>As an alternative to IMAP you can also use the POP protocol. For this you just need to pick POP as the protocol in your e-mail client, and use the port 995. The SMTP settings and usernames and passwords remain the same. However, we strongly recommend to use IMAP or ActiveSync.</p>
+
+					<p>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.</p>
 
 				<h4>Exchange/ActiveSync settings</h4>