diff --git a/mailnews/base/public/nsIMessage.h b/mailnews/base/public/nsIMessage.h
index f290e9f99b9..4833c296d19 100644
--- a/mailnews/base/public/nsIMessage.h
+++ b/mailnews/base/public/nsIMessage.h
@@ -36,10 +36,37 @@ class nsIMessage : public nsIMsgHdr {
   /* nsIMsgFolder GetMsgFolder (); */
   NS_IMETHOD GetMsgFolder(nsIMsgFolder **_retval) = 0;
 
+  /* void SetMsgFolder (in nsIMsgFolder folder); */
+  NS_IMETHOD SetMsgFolder(nsIMsgFolder *folder) = 0;
+
 #ifdef XPIDL_JS_STUBS
   static NS_EXPORT_(JSObject *) InitJSClass(JSContext *cx);
   static NS_EXPORT_(JSObject *) GetJSObject(JSContext *cx, nsIMessage *priv);
 #endif
 };
 
+/* starting interface:    nsIDBMessage */
+
+/* {82702556-01A2-11d3-8A69-0060B0FC04D2} */
+#define NS_IDBMESSAGE_IID_STR "82702556-01A2-11d3-8A69-0060B0FC04D2"
+#define NS_IDBMESSAGE_IID \
+  {0x82702556, 0x01A2, 0x11d3, \
+    { 0x8A, 0x69, 0x00, 0x60, 0xB0, 0xFC, 0x04, 0xD2 }}
+
+class nsIDBMessage : public nsIMessage {
+ public: 
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDBMESSAGE_IID)
+
+  /* void SetMsgDBHdr (in nsIMsgDBHdr hdr); */
+  NS_IMETHOD SetMsgDBHdr(nsIMsgDBHdr *hdr) = 0;
+
+  /* nsIMsgDBHdr GetMsgDBHdr (); */
+  NS_IMETHOD GetMsgDBHdr(nsIMsgDBHdr **_retval) = 0;
+
+#ifdef XPIDL_JS_STUBS
+  static NS_EXPORT_(JSObject *) InitJSClass(JSContext *cx);
+  static NS_EXPORT_(JSObject *) GetJSObject(JSContext *cx, nsIDBMessage *priv);
+#endif
+};
+
 #endif /* __gen_nsIMessage_h__ */
diff --git a/mailnews/base/public/nsIMessage.idl b/mailnews/base/public/nsIMessage.idl
index 3bd7a120bbc..10c218dc509 100644
--- a/mailnews/base/public/nsIMessage.idl
+++ b/mailnews/base/public/nsIMessage.idl
@@ -25,5 +25,13 @@ interface nsIMsgFolder;
 interface nsIMessage : nsIMsgHdr {
 
 	nsIMsgFolder GetMsgFolder();
+	void SetMsgFolder(in nsIMsgFolder folder);
+};
+
+[uuid(82702556-01A2-11d3-8A69-0060B0FC04D2)]    /* XXX regenerate */
+interface nsIDBMessage : nsIMessage {
+
+	void SetMsgDBHdr(in nsIMsgDBHdr hdr);
+	nsIMsgDBHdr GetMsgDBHdr();
 };
 
diff --git a/mailnews/base/public/nsIMsgFolder.h b/mailnews/base/public/nsIMsgFolder.h
index 32bd1126993..37c3f73ea4c 100644
--- a/mailnews/base/public/nsIMsgFolder.h
+++ b/mailnews/base/public/nsIMsgFolder.h
@@ -21,6 +21,7 @@
 #endif
 #include "nsFileSpec.h"
 
+class nsIMessage; /* forward decl */
 
 /* starting interface:    nsIMsgFolder */
 
@@ -207,7 +208,7 @@ class nsIMsgFolder : public nsIFolder {
   /* boolean IsLocked (); */
   NS_IMETHOD IsLocked(PRBool *_retval) = 0;
 
-  /* nsIMessage CreateMessageFromMsgDBHdr (in nsIMsgDBHdr msgHdr); */
+  /* nsIMessage CreateMessageFromMsgDBHdr (in nsIMsgDBHdr msgDBHdr); */
   NS_IMETHOD CreateMessageFromMsgDBHdr(nsIMsgDBHdr *msgDBHdr, nsIMessage **_retval) = 0;
 
 #ifdef XPIDL_JS_STUBS
@@ -264,9 +265,6 @@ class nsIMsgImapMailFolder : public nsISupports {
  public: 
   NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMSGIMAPMAILFOLDER_IID)
 
-  /* readonly attribute nsNativeFileSpec pathName; */
-  NS_IMETHOD GetPathName(nsNativeFileSpec& aPathName) = 0;
-
 #ifdef XPIDL_JS_STUBS
   static NS_EXPORT_(JSObject *) InitJSClass(JSContext *cx);
   static NS_EXPORT_(JSObject *) GetJSObject(JSContext *cx, nsIMsgImapMailFolder *priv);
diff --git a/mailnews/base/public/nsIMsgFolder.idl b/mailnews/base/public/nsIMsgFolder.idl
index 97dd3149f3f..d4171f6dc9b 100644
--- a/mailnews/base/public/nsIMsgFolder.idl
+++ b/mailnews/base/public/nsIMsgFolder.idl
@@ -27,6 +27,7 @@
 %}
 
 native nsNativeFileSpec(nsNativeFileSpec*);
+interface nsIMessage;
 
 [uuid(85e39ff0-b248-11d2-b7ef-00805f05ffa5)]
 interface nsIMsgFolder : nsIFolder {
@@ -136,7 +137,6 @@ interface nsIMsgNewsFolder : nsISupports {
 
 [uuid(FBFEBE79-C1DD-11d2-8A40-0060B0FC04D2)]
 interface nsIMsgImapMailFolder : nsISupports {
-  readonly attribute nsNativeFileSpec pathName;
 };