Use new Horde_Text_Flowed pacakage

diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
index 48c2d2e..f257ef7 100644 (file)
--- a/imp/lib/Compose.php
+++ b/imp/lib/Compose.php
@@ -946,8 +946,7 @@ class IMP_Compose
         $textBody->setDisposition('inline');
 
         /* Send in flowed format. */
-        require_once 'Text/Flowed.php';
-        $flowed = new Text_Flowed($body, $charset);
+        $flowed = new Horde_Text_Flowed($body, $charset);
         $flowed->setDelSp(true);
         $textBody->setContentTypeParameter('format', 'flowed');
         $textBody->setContentTypeParameter('DelSp', 'Yes');
@@ -2222,8 +2221,7 @@ class IMP_Compose
             }
 
             if ($part->getContentTypeParameter('format') == 'flowed') {
-                require_once 'Text/Flowed.php';
-                $flowed = new Text_Flowed($msg);
+                $flowed = new Horde_Text_Flowed($msg);
                 if (String::lower($part->getContentTypeParameter('delsp')) == 'yes') {
                     $flowed->setDelSp(true);
                 }
@@ -2236,8 +2234,7 @@ class IMP_Compose
             }
 
             if (!empty($options['toflowed'])) {
-                require_once 'Text/Flowed.php';
-                $flowed = new Text_Flowed($msg);
+                $flowed = new Horde_Text_Flowed($msg);
                 $msg = $flowed->toFlowed(true);
             }
         }

diff --git a/imp/lib/Message.php b/imp/lib/Message.php
index b02bc20..08769a3 100644 (file)
--- a/imp/lib/Message.php
+++ b/imp/lib/Message.php
@@ -318,7 +318,7 @@ class IMP_Message
                 $body = $body_part->getContents();
 
                 /* Re-flow the message for prettier formatting. */
-                $flowed = new Text_Flowed($mime_message->replaceEOL($body, "\n"));
+                $flowed = new Horde_Text_Flowed($mime_message->replaceEOL($body, "\n"));
                 if ($mime_message->getContentTypeParameter('delsp') == 'yes') {
                     $flowed->setDelSp(true);
                 }