Index: program/lib/imap.inc
===================================================================
--- program/lib/imap.inc	(revision 1131)
+++ program/lib/imap.inc	(working copy)
@@ -1597,6 +1597,7 @@
 					list($field, $string) = iil_SplitHeaderLine($str);
 					
 					$field = strtolower($field);
+					$string = ereg_replace("\n[[:space:]]*"," ",$string);
 					
 					switch ($field) {
 					case 'date';
@@ -1607,22 +1608,22 @@
 						$result[$id]->from = $string;
 						break;
 					case 'to':
-						$result[$id]->to = str_replace("\n", " ", $string);
+						$result[$id]->to = $string;
 						break;
 					case 'subject':
-						$result[$id]->subject = str_replace("\n", '', $string);
+						$result[$id]->subject = $string;
 						break;
 					case 'reply-to':
-						$result[$id]->replyto = str_replace("\n", " ", $string);
+						$result[$id]->replyto = $string;
 						break;
 					case 'cc':
-						$result[$id]->cc = str_replace("\n", " ", $string);
+						$result[$id]->cc = $string;
 						break;
 					case 'bcc':
-						$result[$id]->bcc = str_replace("\n", " ", $string);
+						$result[$id]->bcc = $string;
 						break;
 					case 'content-transfer-encoding':
-						$result[$id]->encoding = str_replace("\n", " ", $string);
+						$result[$id]->encoding = $string;
 						break;
 					case 'content-type':
 						$ctype_parts = explode(";", $string);
@@ -1643,7 +1644,7 @@
 					case 'return-receipt-to':
 					case 'disposition-notification-to':
 					case 'x-confirm-reading-to':
-						$result[$id]->mdn_to = str_replace("\n", " ", $string);
+						$result[$id]->mdn_to = $string;
 						break;
 					case 'message-id':
 						$result[$id]->messageID = $string;