Index: mail.inc
===================================================================
--- mail.inc	(revision 418)
+++ mail.inc	(working copy)
@@ -4,13 +4,18 @@
 /**
  * To generate this file from Drupal 6 mail.inc, delete drupal_mail and
  * drupal_mail_send functions.
+ * 
+ * Also, remove "  " from _drupal_wrap_mail_line as Drupal 5 uses an
+ * unspecified delsp parameter.
  */
 
 /**
  * Perform format=flowed soft wrapping for mail (RFC 3676).
  *
- * We use delsp=yes wrapping, but only break non-spaced languages when
+ * We use delsp unspecified wrapping, but only break non-spaced languages when
  * absolutely necessary to avoid compatibility issues.
+ * 
+ * Drupal 6 uses delsp=yes by default.
  *
  * We deliberately use LF rather than CRLF, see drupal_mail().
  *
@@ -234,7 +239,7 @@
  */
 function _drupal_wrap_mail_line(&$line, $key, $values) {
   // Use soft-breaks only for purely quoted or unindented text.
-  $line = wordwrap($line, 77 - $values['length'], $values['soft'] ? "  \n" : "\n");
+  $line = wordwrap($line, 77 - $values['length'], $values['soft'] ? " \n" : "\n");
   // Break really long words at the maximum width allowed.
   $line = wordwrap($line, 996 - $values['length'], $values['soft'] ? " \n" : "\n");
 }