From 62990dc86c5750153281b84fec9e3a21f34a2f6c Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 30 Sep 2010 15:13:19 -0600
Subject: [PATCH] Fix flowed text when resuming draft

---
 imp/lib/Compose.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
index 89c614328..524a006fe 100644
--- a/imp/lib/Compose.php
+++ b/imp/lib/Compose.php
@@ -375,7 +375,7 @@ class IMP_Compose
 
         $msg_text = $this->_getMessageText($contents, array(
             'html' => $compose_html,
-            'toflowed' => true
+            'toflowed' => false
         ));
 
         if (empty($msg_text)) {
@@ -2535,7 +2535,7 @@ class IMP_Compose
      * <pre>
      * 'html' - (boolean) Return text/html part, if available.
      * 'replylimit' - (boolean) Enforce length limits?
-     * 'toflowed' - (boolean) Convert to flowed?
+     * 'toflowed' - (boolean) Do flowed conversion?
      * </pre>
      *
      * @return mixed  Null if bodypart not found, or array with the following
@@ -2608,9 +2608,11 @@ class IMP_Compose
                 $msg = preg_replace("/\s*\n/U", "\n", $msg);
             }
 
-            if (!empty($options['toflowed'])) {
+            if (isset($options['toflowed'])) {
                 $flowed = new Horde_Text_Flowed($msg);
-                $msg = $flowed->toFlowed(true);
+                $msg = $options['toflowed']
+                    ? $flowed->toFlowed(true)
+                    : $flowed->toFlowed(false, array('nowrap' => true));
             }
         }
 
-- 
2.11.0