Disable auto MDN send option from prefs screen by default

diff --git a/imp/config/prefs.php.dist b/imp/config/prefs.php.dist
index 41b4d74..b383878 100644 (file)
--- a/imp/config/prefs.php.dist
+++ b/imp/config/prefs.php.dist
@@ -851,7 +851,9 @@ $_prefs['disposition_send_mdn'] = array(
     'enum' => array(
         0 => _("Never send read receipt"),
         1 => _("Always prompt"),
-        2 => _("Prompt only if necessary; otherwise automatically send")
+// This option is not given to the user by default - it makes it too easy for
+// spam messages to determine valid e-mail addresses.
+//        2 => _("Prompt only if necessary; otherwise automatically send")
     ),
     'desc' => _("Prompt to send read receipt (a/k/a message disposition notification) when requested by the sender?"),
     'help' => 'prefs-disposition_send_mdn'

diff --git a/imp/locale/en/help.xml b/imp/locale/en/help.xml
index b74a9c2..76af976 100644 (file)
--- a/imp/locale/en/help.xml
+++ b/imp/locale/en/help.xml
@@ -772,7 +772,7 @@
 <entry id="prefs-disposition_send_mdn">
     <title>Preferences: Send Read Receipt</title>
     <para>
-    &quot;Send a MDN&quot; sends a read receipt (also known as a Message Disposition Notification) when you view a message in which the user has requested that they receive notification that you have read the message. By default, you will be prompted to send the notification. Other options include never sending these receipts or sending these receipts automatically without prompt if possible.
+    &quot;Send a MDN&quot; sends a read receipt (also known as a Message Disposition Notification) when you view a message in which the user has requested that they receive notification that you have read the message. By default, you will be prompted to send the notification.
     </para>
 </entry>