diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
index 77a11557a3c..dffa1712711 100644
--- a/imp/lib/Compose.php
+++ b/imp/lib/Compose.php
@@ -1466,7 +1466,7 @@ protected function _createMimeMessage(
                 $body_html->returnHtml(),
                 'Html2text',
                 array(
-                    'wrap' => false
+                    'width' => 0
                 )
             );
         }
diff --git a/imp/lib/Compose/Ui.php b/imp/lib/Compose/Ui.php
index 661a6f57dc9..1bc453fcf86 100644
--- a/imp/lib/Compose/Ui.php
+++ b/imp/lib/Compose/Ui.php
@@ -184,7 +184,7 @@ public function convertComposeText($data, $to)
 
         case 'text':
             return $GLOBALS['injector']->getInstance('Horde_Core_Factory_TextFilter')->filter($data, 'Html2text', array(
-                'wrap' => false
+                'width' => 0
             ));
         }
     }
diff --git a/imp/lib/Mime/Viewer/Html.php b/imp/lib/Mime/Viewer/Html.php
index f3b121f8218..3d76071bbc5 100644
--- a/imp/lib/Mime/Viewer/Html.php
+++ b/imp/lib/Mime/Viewer/Html.php
@@ -206,7 +206,7 @@ protected function _IMPrender($inline)
          * text. */
         if ($convert_text) {
             $data = $this->_textFilter($data, 'Html2text', array(
-                'wrap' => false
+                'width' => 0
             ));
 
             // Filter bad language.