diff --git a/mailnews/base/build/Makefile.in b/mailnews/base/build/Makefile.in
index f16ab5dcaad..77afe8b5704 100644
--- a/mailnews/base/build/Makefile.in
+++ b/mailnews/base/build/Makefile.in
@@ -30,7 +30,7 @@ MODULE		= msgbase
 LIBRARY_NAME	= mailnews
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
-REQUIRES	= xpcom string necko intl locale timer rdf dom js docshell widget layout webshell mime uriloader mailnews mork txmgr pref msgcompose msgbaseutil appcomps msgdb editor appshell xuldoc caps msgnews gfx2 mozcomps
+REQUIRES	= xpcom string necko intl locale timer rdf dom js docshell widget layout webshell mime uriloader mailnews mork txmgr pref msgcompose msgbaseutil appcomps msgdb editor appshell xuldoc caps msgnews gfx2 mozcomps msgimap
 
 ifeq ($(USE_SHORT_LIBNAME),1)
 EXTRA_DSO_LIBS = msgbsutl
diff --git a/mailnews/base/src/nsMsgDBView.cpp b/mailnews/base/src/nsMsgDBView.cpp
index 40c4816f9b6..7bf2485c49c 100644
--- a/mailnews/base/src/nsMsgDBView.cpp
+++ b/mailnews/base/src/nsMsgDBView.cpp
@@ -34,7 +34,6 @@
 #include "nsXPIDLString.h"
 #include "nsQuickSort.h"
 #include "nsIMsgImapMailFolder.h"
-#include "nsIImapIncomingServer.h"
 #include "nsImapCore.h"
 #include "nsMsgFolderFlags.h"
 
@@ -4192,7 +4191,6 @@ nsresult nsMsgDBView::AdjustRowCount(PRInt32 rowCountBeforeSort, PRInt32 rowCoun
 nsresult nsMsgDBView::GetImapDeleteModel(nsIMsgFolder *folder)
 {
    nsresult rv = NS_OK;
-   nsMsgImapDeleteModel deleteModel;
    nsCOMPtr <nsIMsgIncomingServer> server;
    if (folder) //for the search view 
      folder->GetServer(getter_AddRefs(server));
@@ -4200,9 +4198,6 @@ nsresult nsMsgDBView::GetImapDeleteModel(nsIMsgFolder *folder)
      m_folder->GetServer(getter_AddRefs(server));
    nsCOMPtr<nsIImapIncomingServer> imapServer = do_QueryInterface(server, &rv);
    if (NS_SUCCEEDED(rv) && imapServer )
-   {
-     imapServer->GetDeleteModel(&deleteModel);       
-     mDeleteModel = deleteModel;
-   }
+     imapServer->GetDeleteModel(&mDeleteModel);       
    return rv;
 }
diff --git a/mailnews/base/src/nsMsgDBView.h b/mailnews/base/src/nsMsgDBView.h
index e8bfaa3ab2c..a04ef16a9fc 100644
--- a/mailnews/base/src/nsMsgDBView.h
+++ b/mailnews/base/src/nsMsgDBView.h
@@ -41,6 +41,7 @@
 #include "nsIMsgHeaderParser.h"
 #include "nsIDOMElement.h"
 #include "nsIAtom.h"
+#include "nsIImapIncomingServer.h"
 
 #include "nsIStringBundle.h"
 
@@ -248,7 +249,7 @@ protected:
   nsMsgKeyArray m_keys;
   nsUInt32Array m_flags;
   nsUint8Array   m_levels;
-  long mDeleteModel;
+  nsMsgImapDeleteModel mDeleteModel;
 
   // cache the most recently asked for header and corresponding msgKey.
   nsCOMPtr <nsIMsgDBHdr>  m_cachedHdr;
diff --git a/mailnews/base/src/nsMsgSearchDBView.cpp b/mailnews/base/src/nsMsgSearchDBView.cpp
index db7a0d3fc85..261ab805a76 100644
--- a/mailnews/base/src/nsMsgSearchDBView.cpp
+++ b/mailnews/base/src/nsMsgSearchDBView.cpp
@@ -30,7 +30,6 @@
 #include "nsMsgBaseCID.h"
 #include "nsIMsgCopyService.h"
 #include "nsICopyMsgStreamListener.h"
-#include "nsIImapIncomingServer.h"
 
 static NS_DEFINE_CID(kMsgCopyServiceCID,    NS_MSGCOPYSERVICE_CID);
 static NS_DEFINE_CID(kCopyMessageStreamListenerCID, NS_COPYMESSAGESTREAMLISTENER_CID);