diff --git a/mozilla/mailnews/mapi/mapihook/src/Makefile.in b/mozilla/mailnews/mapi/mapihook/src/Makefile.in
index b5340712975..0480792f997 100644
--- a/mozilla/mailnews/mapi/mapihook/src/Makefile.in
+++ b/mozilla/mailnews/mapi/mapihook/src/Makefile.in
@@ -51,7 +51,6 @@ META_COMPONENT	= mail
 MOZILLA_INTERNAL_API = 1
 
 REQUIRES	= xpcom \
-		  xpcom_obsolete \
                   string \
 		  MapiProxy \
 		  appshell \
diff --git a/mozilla/mailnews/mapi/mapihook/src/msgMapiImp.cpp b/mozilla/mailnews/mapi/mapihook/src/msgMapiImp.cpp
index 2dd73a400a7..5f594c0ebcf 100644
--- a/mozilla/mailnews/mapi/mapihook/src/msgMapiImp.cpp
+++ b/mozilla/mailnews/mapi/mapihook/src/msgMapiImp.cpp
@@ -66,8 +66,6 @@
 #include "nsIMsgHeaderParser.h"
 #include "nsILineInputStream.h"
 #include "nsISeekableStream.h"
-#include "nsIFileSpec.h"
-#include "nsFileSpec.h"
 #include "nsILocalFile.h"
 #include "nsIFileStreams.h"
 #include "nsNetCID.h"
@@ -755,12 +753,8 @@ char *MsgMapiListContext::ConvertBodyToMapiFormat (nsIMsgDBHdr *hdr)
     return nsnull;
 
   nsCOMPtr <nsIInputStream> inputStream;
-  nsCOMPtr <nsIFileSpec> fileSpec;
-  folder->GetPath(getter_AddRefs(fileSpec));
-  nsFileSpec realSpec;
-  fileSpec->GetFileSpec(&realSpec);
   nsCOMPtr <nsILocalFile> localFile;
-  NS_FileSpecToIFile(&realSpec, getter_AddRefs(localFile));
+  folder->GetFilePath(getter_AddRefs(localFile));
 
   nsresult rv;
   nsCOMPtr<nsIFileInputStream> fileStream = do_CreateInstance(NS_LOCALFILEINPUTSTREAM_CONTRACTID, &rv);