From 125555ab7b7b8d759747eff12d66c17cff82b297 Mon Sep 17 00:00:00 2001
From: Thomas McGuire <mcguire@kde.org>
Date: Fri, 15 Jan 2010 17:11:58 +0000
Subject: [PATCH] SVN_MERGE Merged revisions 1075167 via svnmerge from
 svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r1075167 | tmcguire | 2010-01-15 17:10:22 +0100 (Fri, 15 Jan 2010) | 7 lines

  When reading the filename of a part, don't fallback to the message charset.
  This is wrong, and will especially fail on codecs that don't map their lower 7
  bits to ascii, like utf16.

  kolab/issue4030
  MERGE: e4, trunk (?, needs to be tested)
........

svn path=/branches/kdepim/enterprise4/kdepim/; revision=1075205
---
 kmmsgpart.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kmmsgpart.cpp b/kmmsgpart.cpp
index 5dc72cff3..03c26ef37 100644
--- a/kmmsgpart.cpp
+++ b/kmmsgpart.cpp
@@ -453,7 +453,7 @@ QString KMMessagePart::fileName( void ) const
   if ( bRFC2231encoded ) {
     return KMMsgBase::decodeRFC2231String( str );
   } else {
-    return KMMsgBase::decodeRFC2047String( str, charset() );
+    return KMMsgBase::decodeRFC2047String( str );
   }
 }