* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 4 insertions, 1 deletions

diff --git a/kmail/kmmsgpart.cpp b/kmail/kmmsgpart.cpp
index 085e36c0f..112236c03 100644
--- a/kmail/kmmsgpart.cpp
+++ b/kmail/kmmsgpart.cpp
@@ -284,6 +284,9 @@ void KMMessagePart::setBodyEncodedBinary(const TQByteArray& aStr)
       assert( codec );
       // Nice: We can use the convenience function :-)
       mBody = codec->encode( aStr );
+      // QP encoding does CRLF -> LF conversion, which can change the size after decoding again
+      // and a size mismatch triggers an assert in various other methods
+      mBodyDecodedSize = -1;
       break;
     }
   default:
@@ -585,7 +588,7 @@ TQString KMMessagePart::fileName(void) const
     const TQCString str = mContentDisposition.mid(startOfFilename,
                                 endOfFilename-startOfFilename+1)
                            .stripWhiteSpace();
-    return KMMsgBase::decodeRFC2047String(str, charset());
+    return KMMsgBase::decodeRFC2047String(str);
   }
 
   return TQString::null;