diff --git a/mozilla/mail/base/jar.mn b/mozilla/mail/base/jar.mn
index 03266905919..54d825c71e7 100644
--- a/mozilla/mail/base/jar.mn
+++ b/mozilla/mail/base/jar.mn
@@ -120,6 +120,7 @@ messenger.jar:
 #endif
 
 comm.jar:
+% content communicator %content/communicator/ xpcnativewrappers=yes
 *+  content/communicator/contentAreaClick.js        (content/contentAreaClick.js)
 *+  content/communicator/utilityOverlay.xul         (content/utilityOverlay.xul)
 *+  content/communicator/utilityOverlay.js          (content/utilityOverlay.js)
@@ -130,5 +131,3 @@ comm.jar:
 toolkit.jar:
 *+  content/global/customizeToolbar.xul             (content/customizeToolbar.xul)
 *+  content/global/customizeToolbar.js              (content/customizeToolbar.js)
-+   content/communicator/tasksOverlay.xul           (content/tasksOverlay.xul)
-*+  content/communicator/utilityOverlay.xul         (content/utilityOverlay.xul)
diff --git a/mozilla/xpfe/Makefile.in b/mozilla/xpfe/Makefile.in
index 5e391df901f..e7c30a1e976 100644
--- a/mozilla/xpfe/Makefile.in
+++ b/mozilla/xpfe/Makefile.in
@@ -50,10 +50,6 @@ ifndef MOZ_SUNBIRD
 DIRS += browser
 endif
 
-ifdef MOZ_THUNDERBIRD
-DIRS += communicator
-endif
-
 ifndef MOZ_XUL_APP
 DIRS += global communicator
 endif