diff --git a/collectionaclpage.cpp b/collectionaclpage.cpp
index 1e7cef28f..dd5278722 100644
--- a/collectionaclpage.cpp
+++ b/collectionaclpage.cpp
@@ -30,6 +30,8 @@
  */
 
 #include "collectionaclpage.h"
+#include <khbox.h>
+#include <QStackedWidget>
 #include "messageviewer/autoqpointer.h"
 
 #include <addressesdialog.h>
@@ -319,7 +321,6 @@ CollectionAclPage::CollectionAclPage( QWidget* parent )
 
 void CollectionAclPage::init()
 {
-#if 0
   QVBoxLayout* topLayout = new QVBoxLayout( this );
   // We need a widget stack to show either a label ("no acl support", "please wait"...)
   // or a listview.
@@ -349,7 +350,6 @@ void CollectionAclPage::init()
        SLOT( slotEditACL( QTreeWidgetItem* ) ) );
   connect( mListView, SIGNAL( itemSelectionChanged() ),
        SLOT( slotSelectionChanged() ) );
-
   KVBox* buttonBox = new KVBox( mACLWidget );
   buttonBox->setSpacing( KDialog::spacingHint() );
   mAddACL = new KPushButton( i18n( "Add Entry..." ), buttonBox );
@@ -363,9 +363,8 @@ void CollectionAclPage::init()
   connect( mRemoveACL, SIGNAL( clicked() ), SLOT( slotRemoveACL() ) );
   mEditACL->setEnabled( false );
   mRemoveACL->setEnabled( false );
-
+  mStack->setCurrentWidget( mACLWidget );
   connect( this, SIGNAL( changed(bool) ), SLOT( slotChanged(bool) ) );
-#endif
 }
 
 void CollectionAclPage::load(const Akonadi::Collection & col)
diff --git a/collectionaclpage.h b/collectionaclpage.h
index d2cb9c03e..e02be3d5e 100644
--- a/collectionaclpage.h
+++ b/collectionaclpage.h
@@ -131,17 +131,18 @@ private:
   void loadListView( const KMail::ACLList& aclList );
   void loadFinished( const KMail::ACLList& aclList );
   void addACLs( const QStringList& userIds, unsigned int permissions );
-
+#endif
 private:
   // The widget containing the ACL widgets (listview and buttons)
   KHBox* mACLWidget;
   //class ListView;
   class ListViewItem;
   QTreeWidget* mListView;
+
   KPushButton* mAddACL;
   KPushButton* mEditACL;
   KPushButton* mRemoveACL;
-
+#if 0
   QStringList mRemovedACLs;
   QString mImapPath;
   ImapAccountBase* mImapAccount;
@@ -150,14 +151,13 @@ private:
   ACLList mInitialACLList;
   ACLList mACLList; // to be set
   IMAPUserIdFormat mUserIdFormat;
-
+#endif
   QLabel* mLabel;
   QStackedWidget* mStack;
 
   bool mChanged;
   bool mAccepting; // i.e. close when done
   bool mSaving;
-#endif
 };
 
 #endif /* COLLECTIONACLPAGE_H */
diff --git a/collectionquotapage.cpp b/collectionquotapage.cpp
index b55e9082b..3119b10a9 100644
--- a/collectionquotapage.cpp
+++ b/collectionquotapage.cpp
@@ -82,9 +82,10 @@ void CollectionQuotaPage::load( const Akonadi::Collection & col )
     qint64 maximumValue = col.attribute<Akonadi::CollectionQuotaAttribute>()->maximumValue();
     mQuotaWidget->setQuotaInfo( currentValue, maximumValue );
   }
-  else
-     mLabel->setText( i18n( "This account does not have support for quota information." ) );
-
+  else {
+    mLabel->setText( i18n( "This account does not have support for quota information." ) );
+    mStack->setCurrentWidget( mLabel );
+  }
 }
 
 void CollectionQuotaPage::save( Akonadi::Collection & )