diff --git a/Makefile.am b/Makefile.am
index 5f66eddce..1a10cf8f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,7 +68,7 @@ libkmailpart_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
 		encryptionconfigurationdialogimpl.cpp kmtextbrowser.cpp \
 		kmcommands.cpp transportmanager.cpp kmreadermainwin.cpp \
 		kmstartup.cpp folderpropertiesdialog.ui \
-		kmsubscription.cpp
+		subscription.cpp
 #  kmail_part.cpp kmmainwidget.cpp kmmsgindex.cpp kmfolderindex.cpp kmfoldersearch.cpp 
 
 METASOURCES = AUTO
diff --git a/kmsubscription.cpp b/subscription.cpp
similarity index 94%
rename from kmsubscription.cpp
rename to subscription.cpp
index 65bb7536f..f9db36eba 100644
--- a/kmsubscription.cpp
+++ b/subscription.cpp
@@ -1,5 +1,5 @@
 /*
-    kmsubscription.cpp
+    subscription.cpp
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -10,7 +10,7 @@
     Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US
 */
 
-#include "kmsubscription.h"
+#include "subscription.h"
 #include "kmmessage.h"
 
 #include <klocale.h>
@@ -18,7 +18,9 @@
 
 #include <qpushbutton.h>
 
-KMSubscription::KMSubscription( QWidget *parent, const QString &caption,
+namespace KMail {
+
+Subscription::Subscription( QWidget *parent, const QString &caption,
     KAccount * acct )
   : KSubscription( parent, caption, acct, User1, QString::null, false )
 {
@@ -44,7 +46,7 @@ KMSubscription::KMSubscription( QWidget *parent, const QString &caption,
 }
 
 //------------------------------------------------------------------------------
-void KMSubscription::slotListDirectory( QStringList mSubfolderNames, 
+void Subscription::slotListDirectory( QStringList mSubfolderNames, 
                                         QStringList mSubfolderPaths, 
                                         QStringList mSubfolderMimeTypes,
                                         KMAcctImap::jobData jobData )
@@ -139,7 +141,7 @@ void KMSubscription::slotListDirectory( QStringList mSubfolderNames,
 }
 
 //------------------------------------------------------------------------------
-void KMSubscription::slotSave()
+void Subscription::slotSave()
 {
   // subscribe
   QListViewItemIterator it(subView);
@@ -159,7 +161,7 @@ void KMSubscription::slotSave()
 }
 
 //------------------------------------------------------------------------------
-void KMSubscription::slotLoadFolders()
+void Subscription::slotLoadFolders()
 {
   folderTree()->clear();
   KMAcctImap* ai = static_cast<KMAcctImap*>(account());
@@ -168,4 +170,6 @@ void KMSubscription::slotLoadFolders()
   ai->listDirectory(ai->prefix(), true);
 }
 
-#include "kmsubscription.moc"
+};
+
+#include "subscription.moc"
diff --git a/kmsubscription.h b/subscription.h
similarity index 58%
rename from kmsubscription.h
rename to subscription.h
index 51a20e4ff..4d3134527 100644
--- a/kmsubscription.h
+++ b/subscription.h
@@ -15,8 +15,8 @@
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
-#ifndef __KMSUBSCRIPTION
-#define __KMSUBSCRIPTION
+#ifndef __SUBSCRIPTION
+#define __SUBSCRIPTION
 
 #include <ksubscription.h>
 
@@ -24,31 +24,35 @@
 
 class KMMessage;
 
-class KMSubscription : public KSubscription
-{
-  Q_OBJECT
+namespace KMail {
 
-  public:
-    KMSubscription( QWidget *parent, const QString &caption, KAccount* acct );
+  class Subscription : public KSubscription
+  {
+    Q_OBJECT
 
-  public slots:
-    /**
-     * get the listing from the imap-server
-     */ 
-    void slotListDirectory(QStringList, QStringList,
-        QStringList, KMAcctImap::jobData);
+    public:
+      Subscription( QWidget *parent, const QString &caption, KAccount* acct );
 
-    /** 
-     * called by Ok-button, saves the changes
-     */ 
-    void slotSave();
+      public slots:
+        /**
+         * get the listing from the imap-server
+         */ 
+        void slotListDirectory(QStringList, QStringList,
+            QStringList, KMAcctImap::jobData);
 
-  protected slots:
-    /**
-     * Loads the folders
-     */ 
-    void slotLoadFolders();
+      /** 
+       * called by Ok-button, saves the changes
+       */ 
+      void slotSave();
 
-};
+      protected slots:
+        /**
+         * Loads the folders
+         */ 
+        void slotLoadFolders();
+
+  };
+
+}; // namespace KMail
 
 #endif