- Fix quoted text wrapping when replying to an HTML email in plain text (#1484141)

git-svn-id: https://svn.roundcube.net/trunk@3250 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 5 insertions, 2 deletions

diff --git a/roundcubemail/program/steps/mail/sendmail.inc b/roundcubemail/program/steps/mail/sendmail.inc
index 589c9af7f..724feb80c 100644
--- a/roundcubemail/program/steps/mail/sendmail.inc
+++ b/roundcubemail/program/steps/mail/sendmail.inc
@@ -357,6 +357,9 @@ if (!$savedraft) {
   }
 }
 
+// set line length for body wrapping
+$LINE_LENGTH = $RCMAIL->config->get('line_length', 75);
+
 // create extended PEAR::Mail_mime instance
 $MAIL_MIME = new rcube_mail_mime($RCMAIL->config->header_delimiter());
 
@@ -369,7 +372,7 @@ if ($isHtml) {
 
   // add a plain text version of the e-mail as an alternative part.
   $h2t = new html2text($plugin['body'], false, true, 0);
-  $plainTextPart = rc_wordwrap($h2t->get_text(), 75, "\r\n") . ($footer ? "\r\n".$footer : '');
+  $plainTextPart = rc_wordwrap($h2t->get_text(), $LINE_LENGTH, "\r\n") . ($footer ? "\r\n".$footer : '');
   $plainTextPart = wordwrap($plainTextPart, 998, "\r\n", true);
   if (!strlen($plainTextPart)) {
     // empty message body breaks attachment handling in drafts 
@@ -383,7 +386,7 @@ if ($isHtml) {
 }
 else
   {
-  $message_body = rc_wordwrap($message_body, 75, "\r\n");
+  $message_body = rc_wordwrap($message_body, $LINE_LENGTH, "\r\n");
   if ($footer)
     $message_body .= "\r\n" . $footer;
   $message_body = wordwrap($message_body, 998, "\r\n", true);