diff --git a/kmmessage.cpp b/kmmessage.cpp
index ca1b6c42d..ee5c28ebf 100644
--- a/kmmessage.cpp
+++ b/kmmessage.cpp
@@ -8,6 +8,8 @@
 #include "kmmsgpart.h"
 #include "kmreaderwin.h"
 #include "mailinglist-magic.h"
+#include "objecttreeparser.h"
+using KMail::ObjectTreeParser;
 #include <kpgp.h>
 #include <kpgpblock.h>
 #include <kdebug.h>
@@ -759,13 +761,13 @@ void KMMessage::parseTextStringFromDwPart( DwBodyPart& dwPart,
   partNode* curNode = rootNode.setFirstChild( new partNode( &dwPart ) );
   curNode->buildObjectTree( false );
   // initialy parse the complete message to decrypt any encrypted parts
-  KMReaderWin::parseObjectTree( 0,
-                                0,
-                                0,
-                                &rootNode,
-                                true,
-                                false,
-                                true );
+  ObjectTreeParser::parseObjectTree( 0,
+				     0,
+				     0,
+				     &rootNode,
+				     true,
+				     false,
+				     true );
   curNode = curNode->findType( DwMime::kTypeText,
                                DwMime::kSubtypeUnknown,
                                true,
@@ -775,13 +777,13 @@ void KMMessage::parseTextStringFromDwPart( DwBodyPart& dwPart,
   if( curNode ) {
     isHTML = DwMime::kSubtypeHtml == curNode->type();
     // now parse the TEXT message part we want to quote
-    KMReaderWin::parseObjectTree( 0,
-                                  &parsedString,
-                                  0,
-                                  curNode,
-                                  true,
-                                  false,
-                                  true );
+    ObjectTreeParser::parseObjectTree( 0,
+				       &parsedString,
+				       0,
+				       curNode,
+				       true,
+				       false,
+				       true );
   }
   kdDebug(5006) << "\n\n======= KMMessage::parseTextStringFromDwPart()   -    parsed string:\n\""
                 << QString( parsedString + "\"\n\n" ) << endl;
diff --git a/kmreaderwin.h b/kmreaderwin.h
index 59c557a54..d6e8e3dfb 100644
--- a/kmreaderwin.h
+++ b/kmreaderwin.h
@@ -1,4 +1,4 @@
-// Header for kmreaderwin the kmail reader
+// Header for kmreaderwin the kmail reader -*- c++ -*-
 // written by Markus Wuebben <markus.wuebben@kde.org>
 
 #ifndef KMREADERWIN_H
@@ -208,6 +208,7 @@ public:
   KAction *urlSaveAsAction() { return mUrlSaveAsAction; }
 // static functions:
 
+ private:
     /** find a plugin matching a given libName */
     static bool foundMatchingCryptPlug( QString libName,
                                         CryptPlugWrapper** useThisCryptPlug_ref,
@@ -238,7 +239,7 @@ public:
                                  bool showOneMimePart=false,
                                  bool keepEncryptions=false,
                                  bool includeSignatures=true );
-
+ public:
     // This function returns the complete data that were in this
     // message parts - *after* all encryption has been removed that
     // could be removed.