diff --git a/CMakeLists.txt b/CMakeLists.txt
index 794efaa7e..f0e7d5afc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,6 @@ set(kmailprivate_LIB_SRCS
    kmgroupware.cpp
    folderstorage.cpp
    csshelper.cpp
-   klistboxdialog.cpp
    actionscheduler.cpp
    messageproperty.cpp
    kmmsgpart.cpp
@@ -189,8 +188,11 @@ set(kmailprivate_LIB_SRCS
    quotajobs.cpp
    folderdialogquotatab.cpp
    folderdialogquotatab_p.cpp
-   keditcl1.cpp keditcl2.cpp folderadaptor.cpp
-   copyfolderjob.cpp messagecopyhelper.cpp
+   keditcl1.cpp
+   keditcl2.cpp
+   folderadaptor.cpp
+   copyfolderjob.cpp
+   messagecopyhelper.cpp
    localsubscriptiondialog.cpp
    groupwareadaptor.cpp
    editorwatcher.cpp
diff --git a/klistboxdialog.cpp b/klistboxdialog.cpp
deleted file mode 100644
index 2cd2ba1db..000000000
--- a/klistboxdialog.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-// This must be first
-
-#include "klistboxdialog.h"
-#include <k3listbox.h>
-#include <QLabel>
-#include <QLayout>
-//Added by qt3to4:
-#include <QVBoxLayout>
-
-KListBoxDialog::KListBoxDialog( QString& _selectedString,
-                                const QString& caption,
-                                const QString& labelText,
-                                QWidget* parent )
-    : KDialog( parent ),
-      selectedString( _selectedString )
-
-{
-    setCaption( caption );
-    setButtons( Ok|Cancel );
-    setObjectName( "KListBoxDialog" );
-    resize( 400, 180 );
-
-    QWidget *page = new QWidget( this );
-    setMainWidget( page );
-    QVBoxLayout *topLayout = new QVBoxLayout( page );
-    topLayout->setSpacing( spacingHint() );
-    topLayout->setMargin( 0 );
-    labelAboveLA = new QLabel( page );
-    labelAboveLA->setObjectName( "labelAboveLA" );
-    labelAboveLA->setText( labelText );
-
-    topLayout->addWidget( labelAboveLA );
-
-    entriesLB = new Q3ListBox( page, "entriesLB" );
-
-    topLayout->addWidget( entriesLB );
-
-    commentBelowLA = new QLabel( page );
-    commentBelowLA->setObjectName( "commentBelowLA" );
-    commentBelowLA->setText( "" );
-    topLayout->addWidget( commentBelowLA );
-    commentBelowLA->hide();
-
-    // signals and slots connections
-    connect( entriesLB, SIGNAL( highlighted( const QString& ) ),
-             this,      SLOT(   highlighted( const QString& ) ) );
-    connect( entriesLB, SIGNAL( selected(int) ),
-                        SLOT(   accept() ) );
-    // buddies
-    labelAboveLA->setBuddy( entriesLB );
-}
-
-/*
- *  Destroys the object and frees any allocated resources
- */
-KListBoxDialog::~KListBoxDialog()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
-void KListBoxDialog::setLabelAbove(const QString& label)
-{
-    labelAboveLA->setText( label );
-    if( label.isEmpty() )
-        labelAboveLA->hide();
-    else
-        labelAboveLA->show();
-}
-
-void KListBoxDialog::setCommentBelow(const QString& comment)
-{
-    commentBelowLA->setText( comment );
-    if( comment.isEmpty() )
-        commentBelowLA->hide();
-    else
-        commentBelowLA->show();
-}
-
-
-
-void KListBoxDialog::highlighted( const QString& txt )
-{
-    selectedString = txt;
-}
-
-#include "klistboxdialog.moc"
diff --git a/klistboxdialog.h b/klistboxdialog.h
deleted file mode 100644
index e25b988a9..000000000
--- a/klistboxdialog.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef KLISTBOXDIALOG_H
-#define KLISTBOXDIALOG_H
-
-#include <kdialog.h>
-
-class QLabel;
-class Q3ListBox;
-
-class KListBoxDialog : public KDialog
-{
-    Q_OBJECT
-
-public:
-    KListBoxDialog( QString& _selectedString,
-                    const QString& caption,
-                    const QString& labelText,
-                    QWidget*    parent = 0 );
-    ~KListBoxDialog();
-    
-    void setLabelAbove(  const QString& label  );
-    void setCommentBelow(const QString& comment);
-    
-    Q3ListBox* entriesLB;
-
-private slots:
-    void highlighted( const QString& );
-
-protected:
-    QString& selectedString;
-    QLabel*  labelAboveLA;
-    QLabel*  commentBelowLA;
-};
-
-#endif
diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp
index 0164da46f..751a5e395 100644
--- a/kmcomposewin.cpp
+++ b/kmcomposewin.cpp
@@ -83,8 +83,6 @@ using MailTransport::TransportManager;
 #include <libkdepim/kvcarddrag.h>
 #include <kio/netaccess.h>
 
-#include "klistboxdialog.h"
-
 #include "messagecomposer.h"
 #include "chiasmuskeyselector.h"
 
diff --git a/messagecomposer.cpp b/messagecomposer.cpp
index f8c1453eb..be45ff0a6 100644
--- a/messagecomposer.cpp
+++ b/messagecomposer.cpp
@@ -34,7 +34,6 @@
 #define REALLY_WANT_KMCOMPOSEWIN_H
 #include "kmcomposewin.h"
 #undef REALLY_WANT_KMCOMPOSEWIN_H
-#include "klistboxdialog.h"
 #include "kcursorsaver.h"
 #include "messagesender.h"
 #include "kmfolder.h"