diff --git a/kmacctmgr.cpp b/kmacctmgr.cpp
index 4a7abf8ba..5c01cbeae 100644
--- a/kmacctmgr.cpp
+++ b/kmacctmgr.cpp
@@ -29,7 +29,7 @@ KMAcctMgr::KMAcctMgr(const char* aBasePath): KMAcctMgrInherited()
   mAcctList.setAutoDelete(TRUE);
   setBasePath(aBasePath);
   mAccountIt = new QListIterator<KMAccount>(mAcctList);
-  mAcctChecking = new QQueue<KMAccount>();
+  mAcctChecking = new QList<KMAccount>();
   checking = false;
   lastAccountChecked = 0;
 }
@@ -117,7 +117,7 @@ void KMAcctMgr::singleCheckMail(KMAccount *account, bool _interactive)
   newMailArrived = false;
   interactive = _interactive;
 
-  mAcctChecking->enqueue(account);
+  if (!mAcctChecking->contains(account)) mAcctChecking->append(account);
 
   if (checking) {
     return;
@@ -168,7 +168,7 @@ void KMAcctMgr::processNextCheck(bool _newMail)
     return;
   }
   
-  KMAccount *curAccount = mAcctChecking->dequeue();
+  KMAccount *curAccount = mAcctChecking->take(0);
   connect( curAccount, SIGNAL(finishedCheck(bool)),
 	   this, SLOT(processNextCheck(bool)) );
 
diff --git a/kmacctmgr.h b/kmacctmgr.h
index 5dc20b59e..365fef375 100644
--- a/kmacctmgr.h
+++ b/kmacctmgr.h
@@ -6,7 +6,6 @@
 #define kmacctmgr_h
 
 #include <qobject.h>
-#include <qqueue.h>
 #include <qlist.h>
 #include <qstring.h>
 #include <qdir.h>
@@ -82,7 +81,7 @@ private:
   QString      mBasePath;
   KMAcctList   mAcctList;
   QListIterator< KMAccount > *mAccountIt;
-  QQueue< KMAccount > *mAcctChecking;
+  QList< KMAccount > *mAcctChecking;
   KMAccount *lastAccountChecked;
   bool checking;
   bool newMailArrived;