diff --git a/mozilla/mailnews/extensions/mailviews/build/Makefile.in b/mozilla/mailnews/extensions/mailviews/build/Makefile.in
index 05d29fa88f3..eb701296e88 100644
--- a/mozilla/mailnews/extensions/mailviews/build/Makefile.in
+++ b/mozilla/mailnews/extensions/mailviews/build/Makefile.in
@@ -39,8 +39,8 @@ REQUIRES	= xpcom \
 		  mailnews \
 		  necko \
 		  msgbaseutil \
-          msgdb \
-          mime \
+          	  msgdb \
+          	  mime \
 		  $(NULL)
 
 ifeq ($(USE_SHORT_LIBNAME),1)
@@ -50,7 +50,6 @@ EXTRA_DSO_LIBS = msgbaseutil
 endif
 
 CPPSRCS		= nsMsgMailViewsFactory.cpp
-EXPORTS		= nsMsgMailViewsCID.h
 
 SHARED_LIBRARY_LIBS = \
 		$(DIST)/lib/$(LIB_PREFIX)mailview_s.$(LIB_SUFFIX) \
diff --git a/mozilla/mailnews/extensions/mailviews/src/Makefile.in b/mozilla/mailnews/extensions/mailviews/src/Makefile.in
index 36548c7fd8c..62c9ad832e2 100644
--- a/mozilla/mailnews/extensions/mailviews/src/Makefile.in
+++ b/mozilla/mailnews/extensions/mailviews/src/Makefile.in
@@ -36,8 +36,8 @@ REQUIRES	= xpcom \
 		  mailnews \
 		  necko \
 		  msgbaseutil \
-          msgdb \
-          mime \
+          	  msgdb \
+          	  mime \
 		  $(NULL)
 
 CPPSRCS		= \
@@ -45,6 +45,7 @@ CPPSRCS		= \
 		$(NULL)
 
 EXPORTS		= \
+		nsMsgMailViewsCID.h \
 		nsMsgMailViewList.h \
 		$(NULL)
 
diff --git a/mozilla/mailnews/extensions/mailviews/src/nsMsgMailViewsCID.h b/mozilla/mailnews/extensions/mailviews/src/nsMsgMailViewsCID.h
new file mode 100644
index 00000000000..c6f4bfb1dd2
--- /dev/null
+++ b/mozilla/mailnews/extensions/mailviews/src/nsMsgMailViewsCID.h
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Scott MacGregor <mscott@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsMsgMailViewsCID_h__
+#define nsMsgMailViewsCID_h__
+
+#define NS_MSGMAILVIEWLIST_CONTRACTID \
+  "@mozilla.org/messenger/mailviewlist;1"
+
+#define NS_MSGMAILVIEWLIST_CID                    \
+{ /* A0258267-44FD-4886-A858-8192615178EC */      \
+ 0xa0258267, 0x44fd, 0x4886,                     \
+ { 0xa8, 0x58, 0x81, 0x92, 0x61, 0x51, 0x78, 0xec }}
+
+#endif /* nsMsgMailViewsCID_h__*/