diff --git a/mailnews/imap/public/nsIIMAPHostSessionList.h b/mailnews/imap/public/nsIIMAPHostSessionList.h
index 06ed6b26ad89..218906ac1b4b 100644
--- a/mailnews/imap/public/nsIIMAPHostSessionList.h
+++ b/mailnews/imap/public/nsIIMAPHostSessionList.h
@@ -58,6 +58,25 @@ public:
 	 NS_IMETHOD GetPasswordVerifiedOnline(const char *hostname, const char *userName, PRBool &result) = 0;
 	 NS_IMETHOD	SetPasswordVerifiedOnline(const char *hostName, const char *userName) = 0;
 
+    // OnlineDir
+    NS_IMETHOD GetOnlineDirForHost(const char *hostName, const char *userName,
+                                   nsString &result) = 0;
+    NS_IMETHOD SetOnlineDirForHost(const char *hostName, const char *userName,
+                                   const char *onlineDir) = 0;
+
+    // Delete is move to trash folder
+    NS_IMETHOD GetDeleteIsMoveToTrashForHost(const char *hostName, const char
+                                             *userName, PRBool &result) = 0;
+    NS_IMETHOD SetDeleteIsMoveToTrashForHost(const char *hostName, const char
+                                             *userName, PRBool isMoveToTrash)
+        = 0;
+
+    // Get namespaces
+    NS_IMETHOD GetGotNamespacesForHost(const char *hostName, const char
+                                       *userName, PRBool &result) = 0;
+    NS_IMETHOD SetGotNamespacesForHost(const char *hostName, const char
+                                       *userName, PRBool gotNamespaces) = 0;
+
 	// Folders
 	 NS_IMETHOD	SetHaveWeEverDiscoveredFoldersForHost(const char *hostname, const char *userName, PRBool discovered) = 0;
 	 NS_IMETHOD	GetHaveWeEverDiscoveredFoldersForHost(const char *hostname, const char *userName, PRBool &result) = 0;
diff --git a/mailnews/imap/public/nsIImapExtension.h b/mailnews/imap/public/nsIImapExtension.h
index 7bded5eeee8f..69fb176d9ec6 100644
--- a/mailnews/imap/public/nsIImapExtension.h
+++ b/mailnews/imap/public/nsIImapExtension.h
@@ -45,13 +45,13 @@ public:
   NS_IMETHOD SetMailAccountUrl(nsIImapProtocol* aProtocol,
 							   const char* hostName) = 0;
   NS_IMETHOD ClearFolderRights(nsIImapProtocol* aProtocol,
-							   TIMAPACLRightsInfo* aclRights) = 0;
+							   nsIMAPACLRightsInfo* aclRights) = 0;
   NS_IMETHOD AddFolderRights(nsIImapProtocol* aProtocol,
-							 TIMAPACLRightsInfo* aclRights) = 0;
+							 nsIMAPACLRightsInfo* aclRights) = 0;
   NS_IMETHOD RefreshFolderRights(nsIImapProtocol* aProtocol,
-								 TIMAPACLRightsInfo* aclRights) = 0;
+								 nsIMAPACLRightsInfo* aclRights) = 0;
   NS_IMETHOD FolderNeedsACLInitialized(nsIImapProtocol* aProtocol,
-									   TIMAPACLRightsInfo* aclRights) = 0;
+									   nsIMAPACLRightsInfo* aclRights) = 0;
   NS_IMETHOD SetFolderAdminURL(nsIImapProtocol* aProtocol,
 							   FolderQueryInfo* aInfo) = 0;
 };
diff --git a/mailnews/imap/public/nsIImapUrl.h b/mailnews/imap/public/nsIImapUrl.h
index f690d7f07751..bc0c5e86c80e 100644
--- a/mailnews/imap/public/nsIImapUrl.h
+++ b/mailnews/imap/public/nsIImapUrl.h
@@ -132,7 +132,7 @@ public:
 	NS_IMETHOD SetImapAction(nsImapAction aImapAction) = 0;
 
 	NS_IMETHOD GetImapPartToFetch(char **resultPart) const = 0;
-	NS_IMETHOD AllocateCannonicalPath(const char *serverPath, char onlineDelimiter, char **allocatedPath ) const = 0;
+	NS_IMETHOD AllocateCanonicalPath(const char *serverPath, char onlineDelimiter, char **allocatedPath ) const = 0;
 
 	NS_IMETHOD	CreateListOfMessageIdsString(char **result) const = 0;
 };