diff --git a/kmfolderdia.cpp b/kmfolderdia.cpp
index f54e6b8f3..c11dc34d0 100644
--- a/kmfolderdia.cpp
+++ b/kmfolderdia.cpp
@@ -123,8 +123,17 @@ KMFolderDialog::KMFolderDialog(KMFolder* aFolder, KMFolderDir *aFolderDir,
     mUnreadIconButton->setEnabled( false );
   }
 
-  connect( mIconsCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotEnableIcons(bool)) );
-  connect( mNormalIconButton, SIGNAL(iconChanged(QString)), this, SLOT(slotChangeIcon(QString)) );
+  connect( mIconsCheckBox, SIGNAL(toggled(bool)),
+	   mNormalIconButton, SLOT(setEnabled(bool)) );
+  connect( mIconsCheckBox, SIGNAL(toggled(bool)),
+	   mUnreadIconButton, SLOT(setEnabled(bool)) );
+  connect( mIconsCheckBox, SIGNAL(toggled(bool)),
+	   ilabel, SLOT(setEnabled(bool)) );
+  connect( mIconsCheckBox, SIGNAL(toggled(bool)),
+	   ilabel2, SLOT(setEnabled(bool)) );
+
+  connect( mNormalIconButton, SIGNAL(iconChanged(QString)),
+	   this, SLOT(slotChangeIcon(QString)) );
 
   //end icons group
   
@@ -186,8 +195,6 @@ KMFolderDialog::KMFolderDialog(KMFolder* aFolder, KMFolderDir *aFolderDir,
   QGridLayout *mlLayout = new QGridLayout(mlGroup->layout());
   mlLayout->setSpacing( 6 );
   holdsMailingList = new QCheckBox( i18n("&Folder holds a mailing list"), mlGroup);
-  QObject::connect( holdsMailingList, SIGNAL(toggled(bool)),
-                    SLOT(slotHoldsML(bool)) );
   topLayout->addWidget( mlGroup );
   mlLayout->addMultiCellWidget(holdsMailingList, 0, 0, 0, 1);
 
@@ -204,6 +211,9 @@ KMFolderDialog::KMFolderDialog(KMFolder* aFolder, KMFolderDir *aFolderDir,
   mlLayout->addWidget( mailingListPostAddress, 1, 1 );
   mailingListPostAddress->setEnabled(false);
 
+  connect( holdsMailingList, SIGNAL(toggled(bool)),
+	   mailingListPostAddress, SLOT(setEnabled(bool)) );
+
   //
   // Expiry data.
   //
@@ -557,22 +567,6 @@ void KMFolderDialog::slotOk()
   KDialogBase::slotOk();
 }
 
-//-----------------------------------------------------------------------------
-void KMFolderDialog::slotHoldsML( bool holdsML )
-{
-  if ( holdsML )
-  {
-    mailingListPostAddress->setEnabled(true);
-//     mailingListAdminAddress->setEnabled(true);
-  }
-  else
-  {
-    mailingListPostAddress->setEnabled(false);
-//     mailingListAdminAddress->setEnabled(false);
-  }
-
-//  mailingListIdentity->setEnabled(holdsML);
-}
 
 /**
  * Called when the 'auto expire' toggle is clicked.
@@ -618,15 +612,6 @@ KMFolderDialog::slotUnreadExpiryUnitChanged( int value )
 }
 
 
-void 
-KMFolderDialog::slotEnableIcons( bool yes)
-{
-  mNormalIconButton->setEnabled( yes );
-  mUnreadIconButton->setEnabled( yes );
-  if ( folder ) 
-    folder->setUseCustomIcons( yes );
-}
-
 void 
 KMFolderDialog::slotChangeIcon( QString icon )
 {
diff --git a/kmfolderdia.h b/kmfolderdia.h
index a5c56c3af..886f6f1b8 100644
--- a/kmfolderdia.h
+++ b/kmfolderdia.h
@@ -30,11 +30,9 @@ public:
 
 protected slots:
   virtual void slotOk( void );
-  virtual void slotHoldsML( bool );
   virtual void slotExpireFolder( bool );
   void slotReadExpiryUnitChanged( int );
   void slotUnreadExpiryUnitChanged( int );
-  virtual void slotEnableIcons( bool );
   virtual void slotChangeIcon( QString icon );
   /* 
    * is called if the folder dropdown changes