Fix adding body text to forward.

Don't check for locked forward_default pref in forwardMessage(). It
prevents us from adding body text in dimp. A locked preference here
only means not to show the list of forward choices.

diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
index c2fa9e5..8df4378 100644 (file)
--- a/imp/lib/Compose.php
+++ b/imp/lib/Compose.php
@@ -1534,8 +1534,7 @@ class IMP_Compose
             'subject' => ''
         );
 
-        if ($GLOBALS['prefs']->isLocked('forward_default') ||
-            ($type == 'forward_auto')) {
+        if ($type == 'forward_auto') {
             if (!($type = $GLOBALS['prefs']->getValue('forward_default'))) {
                 $type = 'attach';
             }