Index: includes/mail.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/mail.inc,v
retrieving revision 1.8.2.3
diff -u -r1.8.2.3 mail.inc
--- includes/mail.inc	19 May 2008 08:19:00 -0000	1.8.2.3
+++ includes/mail.inc	22 Aug 2008 16:37:56 -0000
@@ -391,7 +391,7 @@
     // Process blocks of text.
     else {
       // Convert inline HTML text to plain text.
-      $value = trim(preg_replace('/\s+/', ' ', decode_entities($value)));
+      $value = trim(preg_replace('/ +/', ' ', decode_entities($value)));
       if (strlen($value)) {
         $chunk = $value;
       }