diff --git a/kmmsgpart.cpp b/kmmsgpart.cpp
index f30360329..839cff71e 100644
--- a/kmmsgpart.cpp
+++ b/kmmsgpart.cpp
@@ -99,24 +99,17 @@ void KMMessagePart::setBodyEncoded(const QCString& aStr)
 //-----------------------------------------------------------------------------
 void KMMessagePart::setBodyEncodedBinary(const QByteArray& aStr)
 {
-  DwString dwResult, dwSrc;
   int encoding = contentTransferEncoding();
-  int len;
 
   mBodySize = aStr.size();
 
   switch (encoding)
   {
   case DwMime::kCteQuotedPrintable:
+    mBody = KCodecs::quotedPrintableEncode(aStr);
+    break;
   case DwMime::kCteBase64:
-    dwSrc = DwString(aStr.data(), aStr.size());
-    if (encoding == DwMime::kCteQuotedPrintable)
-      DwEncodeQuotedPrintable(dwSrc, dwResult);
-    else
-      DwEncodeBase64(dwSrc, dwResult);
-    len = dwResult.size();
-    mBody.truncate(len);
-    memcpy(mBody.data(), dwResult.data(), len);
+    mBody = KCodecs::base64Encode(aStr);
     break;
   default:
     kdDebug(5006) << "WARNING -- unknown encoding `" << (const char*)cteStr() << "'. Assuming 8bit." << endl;
@@ -132,7 +125,6 @@ void KMMessagePart::setBodyEncodedBinary(const QByteArray& aStr)
 //-----------------------------------------------------------------------------
 QByteArray KMMessagePart::bodyDecodedBinary(void) const
 {
-  DwString dwResult, dwSrc;
   QByteArray result;
   int encoding = contentTransferEncoding();
   int len;
@@ -140,29 +132,23 @@ QByteArray KMMessagePart::bodyDecodedBinary(void) const
   switch (encoding)
   {
   case DwMime::kCteQuotedPrintable:
+    result = KCodecs::quotedPrintableDecode(QCString(mBody.data(), mBody.size() + 1));
+    break;
   case DwMime::kCteBase64:
-    dwSrc = DwString(mBody.data(), mBody.size());
-    if (encoding == DwMime::kCteQuotedPrintable)
-      DwDecodeQuotedPrintable(dwSrc, dwResult);
-    else
-      DwDecodeBase64(dwSrc, dwResult);
-    len = dwResult.size();
-    result.resize(len);
-    memcpy(result.data(), dwResult.c_str(), len);
+    result = KCodecs::base64Decode(QCString(mBody.data(), mBody.size() + 1));
     break;
   default:
     kdDebug(5006) << "WARNING -- unknown encoding `" << (const char*)cteStr() << "'. Assuming 8bit." << endl;
   case DwMime::kCte7bit:
   case DwMime::kCte8bit:
   case DwMime::kCteBinary:
-    len = mBody.size() - 1;
-    result.resize(len);
-    if (len) memcpy(result.data(), mBody.data(), len);
+    result.duplicate(mBody);
     break;
   }
 // do this for cases where bodyDecoded instead of bodyDecodedText
 // is called. This does not warrant a trailing 0 - realloc might
 // change the address. Maybe this is not really needed.
+  len = result.size();
   result.resize(len+1);
   result[len] = 0;
   result.resize(len);