Fix the "\nFrom " mbox problem in an IMHO correct way.

svn path=/trunk/kdenetwork/kmail/; revision=76446

kmfolder.cpp

@@ -1042,6 +1042,7 @@ int KMFolder::addMsg(KMMessage* aMsg, int* aIndex_ret)
 
   aMsg->setStatusFields();
   msgText = aMsg->asString();
+  msgText.replace(QRegExp("\nFrom "),"\n>From ");
   len = msgText.length();
 
   assert(mStream != NULL);

kmmessage.cpp

@@ -254,7 +254,8 @@ void KMMessage::fromString(const QString& aStr, bool aSetStatus)
   resultPos = (char*)result.data();
   if (strPos) for (; (ch=*strPos)!='\0'; strPos++)
   {
-    if (ch>=' ' || ch=='\t' || ch=='\n' || ch<='\0')
+    if ((ch>=' ' || ch=='\t' || ch=='\n' || ch<='\0')
+       && !(ch=='>' && aStr.mid(strPos-aStr.data()-1,6)=="\n>From"))
       *resultPos++ = ch;
   }
   *resultPos = '\0'; // terminate zero for casting