--- a/mail/build.mk
+++ b/mail/build.mk
@@ -63,16 +63,17 @@ endif
 ifdef MOZ_BRANDING_DIRECTORY
 tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
 else
 tier_app_dirs += mail/branding/nightly
 endif
 
 tier_app_dirs += \
 	mailnews/base \
+	mailnews/mime/public \
 	mailnews \
 	$(NULL)
 
 ifdef MOZ_CALENDAR
 tier_app_dirs += calendar/lightning
 endif
 
 tier_app_dirs += \

--- a/mailnews/Makefile.in
+++ b/mailnews/Makefile.in
@@ -39,26 +39,36 @@ DEPTH		= ..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE       = mailnews
 
-PARALLEL_DIRS	+= base/search/src db/msgdb db/gloda news local mime imap addrbook import extensions
+PARALLEL_DIRS	+= \
+	addrbook \
+	base/search/src \
+	compose \
+	db/gloda \
+	db/msgdb \
+	extensions\
+	imap \
+	import \
+	local \
+	mime \
+	news \
+	$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
 ifndef GNU_CC
 PARALLEL_DIRS	+= mapi/mapiDLL mapi/mapihook
 endif
 endif
 
-DIRS = compose
-
 ifdef MOZ_STATIC_MAIL_BUILD
 DIRS += build
 else
 DIRS += base/build
 endif
 
 PREF_JS_EXPORTS = $(srcdir)/mailnews.js
 

--- a/suite/build.mk
+++ b/suite/build.mk
@@ -60,17 +60,21 @@ ifdef MOZ_COMPOSER
 tier_app_dirs += editor/ui
 endif
 
 ifdef MOZ_BRANDING_DIRECTORY
 tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
 endif
 
 ifdef MOZ_MAIL_NEWS
-tier_app_dirs += mailnews/base mailnews
+tier_app_dirs += \
+	mailnews/base \
+	mailnews/mime/public \
+	mailnews \
+	$(NULL)
 endif
 
 ifdef MOZ_CALENDAR
 tier_app_dirs += calendar/lightning
 endif
 
 tier_app_dirs += \
 	suite \