Index: trunk/roundcubemail/program/steps/mail/sendmail.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/sendmail.inc	(revision 543)
+++ trunk/roundcubemail/program/steps/mail/sendmail.inc	(revision 556)
@@ -259,5 +259,5 @@
   // add a plain text version of the e-mail as an alternative part.
   $h2t = new html2text($message_body);
-  $plainTextPart = $h2t->get_text();
+  $plainTextPart = wordwrap($h2t->get_text(), 998, "\r\n", true);
   $MAIL_MIME->setTXTBody($plainTextPart);
 
@@ -267,4 +267,6 @@
 else
   {
+  $message_body = wordwrap($message_body, 75, "\r\n");
+  $message_body = wordwrap($message_body, 998, "\r\n", true);
   $MAIL_MIME->setTXTBody($message_body, FALSE, TRUE);
   }
@@ -287,10 +289,12 @@
 
 // encoding settings for mail composing
-$message_param = array('text_encoding' => $transfer_encoding,
-                       'html_encoding' => 'quoted-printable',
-                       'head_encoding' => 'quoted-printable',
-                       'head_charset'  => $message_charset,
-                       'html_charset'  => $message_charset,
-                       'text_charset'  => $message_charset);
+$message_param = array(
+  'text_encoding' => $transfer_encoding,
+  'html_encoding' => 'quoted-printable',
+  'head_encoding' => 'quoted-printable',
+  'head_charset'  => $message_charset,
+  'html_charset'  => $message_charset,
+  'text_charset'  => $message_charset,
+);
 
 // compose message body and get headers