Move most of the stuff back where it was...

mail/app.mozbuild

@@ -3,7 +3,13 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-include('/mailnews/mailnews.mozbuild')
+if CONFIG['MOZ_LDAP_XPCOM']:
+    DIRS += ['/modules/ldap']
+
+if CONFIG['MOZ_MORK']:
+    DIRS += ['/modules/mork']
+
+DIRS += ['/mailnews']
 
 DIRS += ['/mail/components']
 

mail/app/splash.rc

@@ -17,7 +17,7 @@ IDI_APPLICATION ICON THUNDERBIRD_ICO
 
 // For some reason IDI_MAILBIFF needs to be larger than the value of IDI_APPLICATION for static builds
 #define IDI_MAILBIFF 32576
-IDI_MAILBIFF  ICON  "../../mailnews/core/build/newmail.ico"
+IDI_MAILBIFF  ICON  "../../mailnews/build/newmail.ico"
 
 // Windows taskbar icons
 #define IDI_WRITE_MESSAGE 32577

mail/extensions/smime/jar.mn

@@ -14,16 +14,16 @@ messenger.jar:
    content/messenger-smime/msgCompSMIMEOverlay.js                   (content/msgCompSMIMEOverlay.js)
    content/messenger-smime/msgHdrViewSMIMEOverlay.js                (content/msgHdrViewSMIMEOverlay.js)
    content/messenger-smime/msgHdrViewSMIMEOverlay.xul               (content/msgHdrViewSMIMEOverlay.xul)
-   content/messenger/am-smime.xul                                   (/mailnews/core/extensions/smime/content/am-smime.xul)
-   content/messenger/am-smime.js                                    (/mailnews/core/extensions/smime/content/am-smime.js)
-   content/messenger/am-smimeIdentityEditOverlay.xul                (/mailnews/core/extensions/smime/content/am-smimeIdentityEditOverlay.xul)
-   content/messenger/am-smimeOverlay.xul                            (/mailnews/core/extensions/smime/content/am-smimeOverlay.xul)
-   content/messenger/certpicker.js                                  (/mailnews/core/extensions/smime/content/certpicker.js)
-   content/messenger/certpicker.xul                                 (/mailnews/core/extensions/smime/content/certpicker.xul)
-   content/messenger-smime/msgReadSMIMEOverlay.js                   (/mailnews/core/extensions/smime/content/msgReadSMIMEOverlay.js)
-   content/messenger-smime/msgCompSecurityInfo.js                   (/mailnews/core/extensions/smime/content/msgCompSecurityInfo.js)
-   content/messenger-smime/msgCompSecurityInfo.xul                  (/mailnews/core/extensions/smime/content/msgCompSecurityInfo.xul)
-   content/messenger-smime/msgReadSecurityInfo.xul                  (/mailnews/core/extensions/smime/content/msgReadSecurityInfo.xul)
-   content/messenger-smime/msgReadSecurityInfo.js                   (/mailnews/core/extensions/smime/content/msgReadSecurityInfo.js)
-   content/messenger-smime/certFetchingStatus.xul                   (/mailnews/core/extensions/smime/content/certFetchingStatus.xul)
-   content/messenger-smime/certFetchingStatus.js                    (/mailnews/core/extensions/smime/content/certFetchingStatus.js)
+   content/messenger/am-smime.xul                                   (/mailnews/extensions/smime/content/am-smime.xul)
+   content/messenger/am-smime.js                                    (/mailnews/extensions/smime/content/am-smime.js)
+   content/messenger/am-smimeIdentityEditOverlay.xul                (/mailnews/extensions/smime/content/am-smimeIdentityEditOverlay.xul)
+   content/messenger/am-smimeOverlay.xul                            (/mailnews/extensions/smime/content/am-smimeOverlay.xul)
+   content/messenger/certpicker.js                                  (/mailnews/extensions/smime/content/certpicker.js)
+   content/messenger/certpicker.xul                                 (/mailnews/extensions/smime/content/certpicker.xul)
+   content/messenger-smime/msgReadSMIMEOverlay.js                   (/mailnews/extensions/smime/content/msgReadSMIMEOverlay.js)
+   content/messenger-smime/msgCompSecurityInfo.js                   (/mailnews/extensions/smime/content/msgCompSecurityInfo.js)
+   content/messenger-smime/msgCompSecurityInfo.xul                  (/mailnews/extensions/smime/content/msgCompSecurityInfo.xul)
+   content/messenger-smime/msgReadSecurityInfo.xul                  (/mailnews/extensions/smime/content/msgReadSecurityInfo.xul)
+   content/messenger-smime/msgReadSecurityInfo.js                   (/mailnews/extensions/smime/content/msgReadSecurityInfo.js)
+   content/messenger-smime/certFetchingStatus.xul                   (/mailnews/extensions/smime/content/certFetchingStatus.xul)
+   content/messenger-smime/certFetchingStatus.js                    (/mailnews/extensions/smime/content/certFetchingStatus.js)