From 12324018f9b38a5ed44a79dc228828125eea2f2b Mon Sep 17 00:00:00 2001
From: Michael Haeckel <haeckel@kde.org>
Date: Sun, 29 Jul 2001 07:54:52 +0000
Subject: [PATCH] Unfold headers that don't contain non-ascii characters
 correctely.

svn path=/trunk/kdenetwork/kmail/; revision=108234
---
 kmmessage.cpp | 12 ++++++------
 kmmsgbase.cpp |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/kmmessage.cpp b/kmmessage.cpp
index 957712e74..9441b9dec 100644
--- a/kmmessage.cpp
+++ b/kmmessage.cpp
@@ -1275,7 +1275,7 @@ void KMMessage::setDate(const QCString& aStr)
 //-----------------------------------------------------------------------------
 QString KMMessage::to(void) const
 {
-  return headerField("To").simplifyWhiteSpace();
+  return headerField("To");
 }
 
 
@@ -1294,7 +1294,7 @@ QString KMMessage::toStrip(void) const
 //-----------------------------------------------------------------------------
 QString KMMessage::replyTo(void) const
 {
-  return headerField("Reply-To").simplifyWhiteSpace();
+  return headerField("Reply-To");
 }
 
 
@@ -1315,7 +1315,7 @@ void KMMessage::setReplyTo(KMMessage* aMsg)
 //-----------------------------------------------------------------------------
 QString KMMessage::cc(void) const
 {
-  return headerField("Cc").simplifyWhiteSpace();
+  return headerField("Cc");
 }
 
 
@@ -1329,7 +1329,7 @@ void KMMessage::setCc(const QString& aStr)
 //-----------------------------------------------------------------------------
 QString KMMessage::bcc(void) const
 {
-  return headerField("Bcc").simplifyWhiteSpace();
+  return headerField("Bcc");
 }
 
 
@@ -1355,7 +1355,7 @@ QString KMMessage::who(void) const
 //-----------------------------------------------------------------------------
 QString KMMessage::from(void) const
 {
-  return headerField("From").simplifyWhiteSpace();
+  return headerField("From");
 }
 
 
@@ -1386,7 +1386,7 @@ QCString KMMessage::fromEmail(void) const
 //-----------------------------------------------------------------------------
 QString KMMessage::subject(void) const
 {
-  return headerField("Subject").simplifyWhiteSpace();
+  return headerField("Subject");
 }
 
 
diff --git a/kmmsgbase.cpp b/kmmsgbase.cpp
index 16d9eee21..31c1213da 100644
--- a/kmmsgbase.cpp
+++ b/kmmsgbase.cpp
@@ -212,7 +212,8 @@ QString KMMsgBase::decodeRFC2047String(const QCString& aStr)
   const int maxLen=200;
   int i;
 
-  if (aStr.find("=?") < 0) return QString::fromLocal8Bit(aStr);
+  if (aStr.find("=?") < 0)
+    return QString::fromLocal8Bit(aStr).replace(QRegExp("\n[\t ]")," ");
 
   for (pos=aStr.data(); *pos; pos++)
   {