From 442d3de9a189df30a79e0c90987a542c6586a3b0 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 19 Mar 2010 11:11:16 -0600
Subject: [PATCH] Better documentation for UTF7-IMAP prefs values

---
 imp/config/prefs.php.dist | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/imp/config/prefs.php.dist b/imp/config/prefs.php.dist
index b8fa69292..22cf978b0 100644
--- a/imp/config/prefs.php.dist
+++ b/imp/config/prefs.php.dist
@@ -291,11 +291,13 @@ $_prefs['save_sent_mail'] = array(
 
 // sent mail folder
 $_prefs['sent_mail_folder'] = array(
-    // The mailbox value must be encoded in the UTF7-IMAP charset (see RFC
-    // 3501 [5.1.3]). For Exchange, uncomment the entry below and remove the
-    // default value entry.
-    // 'value' => 'Sent Items',
     'value' => 'Sent',
+    // If the mailbox value contains non-ASCII characters, it must be encoded
+    // in the UTF7-IMAP charset (RFC 3501 [5.1.3]). This entry will do the
+    // necessary conversion.
+    // 'value' => Horde_String::convertCharset('Sent', null, 'UTF7-IMAP'),
+    // Exchange servers use this default value instead.
+    // 'value' => 'Sent Items',
     'locked' => false,
     'shared' => false,
     'type' => 'implicit');
@@ -331,9 +333,11 @@ $_prefs['draftsselect'] = array('type' => 'special');
 
 // drafts folder
 $_prefs['drafts_folder'] = array(
-    // The mailbox value must be encoded in the UTF7-IMAP charset (see RFC
-    // 3501 [5.1.3]).
     'value' => 'Drafts',
+    // If the mailbox value contains non-ASCII characters, it must be encoded
+    // in the UTF7-IMAP charset (RFC 3501 [5.1.3]). This entry will do the
+    // necessary conversion.
+    // 'value' => Horde_String::convertCharset('Drafts', null, 'UTF7-IMAP'),
     'locked' => false,
     'shared' => false,
     'type' => 'implicit');
@@ -344,11 +348,13 @@ $_prefs['trashselect'] = array('type' => 'special');
 
 // trash folder
 $_prefs['trash_folder'] = array(
-    // The mailbox value must be encoded in the UTF7-IMAP charset (see RFC
-    // 3501 [5.1.3]). For Exchange, uncomment the entry below and remove the
-    // default value entry.
-    // 'value' => 'Deleted Items',
     'value' => 'Trash',
+    // If the mailbox value contains non-ASCII characters, it must be encoded
+    // in the UTF7-IMAP charset (RFC 3501 [5.1.3]). This entry will do the
+    // necessary conversion.
+    // 'value' => Horde_String::convertCharset('Trash', null, 'UTF7-IMAP'),
+    // Exchange servers use this default value instead.
+    // 'value' => 'Deleted Items',
     'locked' => false,
     'shared' => false,
     'type' => 'implicit');
@@ -359,9 +365,11 @@ $_prefs['spamselect'] = array('type' => 'special');
 
 // spam folder
 $_prefs['spam_folder'] = array(
-    // The mailbox value must be encoded in the UTF7-IMAP charset (see RFC
-    // 3501 [5.1.3]).
     'value' => 'Spam',
+    // If the mailbox value contains non-ASCII characters, it must be encoded
+    // in the UTF7-IMAP charset (RFC 3501 [5.1.3]). This entry will do the
+    // necessary conversion.
+    // 'value' => Horde_String::convertCharset('Spam', null, 'UTF7-IMAP'),
     'locked' => false,
     'shared' => false,
     'type' => 'implicit');
-- 
2.11.0