diff --git a/netwerk/streamconv/converters/nsMultiMixedConv.cpp b/netwerk/streamconv/converters/nsMultiMixedConv.cpp
index 25a61bfa983..d0293d3fe36 100644
--- a/netwerk/streamconv/converters/nsMultiMixedConv.cpp
+++ b/netwerk/streamconv/converters/nsMultiMixedConv.cpp
@@ -573,14 +573,6 @@ nsMultiMixedConv::OnDataAvailable(nsIRequest *request, nsISupports *context,
         }
         else {
             mNewPart = PR_TRUE;
-            // Reset state so we don't carry it over from part to part
-            mContentType.Truncate();
-            mContentLength = -1;
-            mContentDisposition.Truncate();
-            mIsByteRangeRequest = PR_FALSE;
-            mByteRangeStart = 0;
-            mByteRangeEnd = 0;
-            
             rv = SendStop(NS_OK);
             if (NS_FAILED(rv)) ERR_OUT
             // reset the token to front. this allows us to treat
diff --git a/uriloader/base/nsURILoader.cpp b/uriloader/base/nsURILoader.cpp
index 5ff54dc54a9..e76605fb836 100644
--- a/uriloader/base/nsURILoader.cpp
+++ b/uriloader/base/nsURILoader.cpp
@@ -54,7 +54,6 @@
 #include "nsIStreamConverterService.h"
 #include "nsWeakReference.h"
 #include "nsIHttpChannel.h"
-#include "nsIMultiPartChannel.h"
 #include "netCore.h"
 #include "nsCRT.h"
 
@@ -285,54 +284,6 @@ nsresult nsDocumentOpenInfo::DispatchContent(nsIRequest *request, nsISupports *
     nsCOMPtr<nsIURIContentListener> contentListener;
     nsXPIDLCString desiredContentType;
 
-    // Check whether the data should be forced to be handled
-    // externally.  This could happen because the Content-Disposition
-    // header is set so, or, in the future, because the user has
-    // specified external handling for the MIME type.
-    PRBool forceExternalHandling = PR_FALSE;
-    nsCAutoString disposition;
-    nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(request));
-    if (httpChannel)
-    {
-      rv = httpChannel->GetResponseHeader(NS_LITERAL_CSTRING("content-disposition"),
-                                          disposition);
-    }
-    else
-    {
-      nsCOMPtr<nsIMultiPartChannel> multipartChannel(do_QueryInterface(request));
-      if (multipartChannel)
-      {
-        rv = multipartChannel->GetContentDisposition(disposition);
-      }
-    }
-
-    if (NS_SUCCEEDED(rv) && !disposition.IsEmpty())
-    {
-      nsCAutoString::const_iterator start, end;
-      disposition.BeginReading(start);
-      disposition.EndReading(end);
-      // skip leading whitespace
-      while (start != end && nsCRT::IsAsciiSpace(*start))
-      {
-        ++start;
-      }
-      nsCAutoString::const_iterator iter = start;
-      // walk forward till we hit the next whitespace or semicolon
-      while (iter != end && *iter != ';' && !nsCRT::IsAsciiSpace(*iter))
-      {
-        ++iter;
-      }
-      if (start != iter &&
-          Substring(start, iter).Equals(NS_LITERAL_CSTRING("attachment"),
-                                        nsCaseInsensitiveCStringComparator()))
-      {
-        // We have a content-disposition of "attachment"
-        forceExternalHandling = PR_TRUE;
-      }
-    }
-    
-    if (!forceExternalHandling)
-    {
     //
     // First step:  See if any nsIURIContentListener prefers to handle this
     //              content type.
@@ -351,17 +302,11 @@ nsresult nsDocumentOpenInfo::DispatchContent(nsIRequest *request, nsISupports *
     // else must have stepped in and taken over for us...so stop..
 
     if (abortDispatch) return NS_OK;
-    }
-
     //
     // Second step:  If no listener prefers this type, see if any stream
     //               decoders exist to transform this content type into
     //               some other.
     //
-
-    // We always want to do this, since even content being forced to
-    // be handled externally may need decoding (eg via the unknown
-    // content decoder)
     if (!contentListener) 
     {
       rv = RetargetOutput(request, contentType.get(), "*/*", nsnull);
@@ -386,8 +331,6 @@ nsresult nsDocumentOpenInfo::DispatchContent(nsIRequest *request, nsISupports *
     //
     if (contentListener)
     {
-      if (!forceExternalHandling)
-      {
       PRBool bAbortProcess = PR_FALSE;     
       nsCAutoString contentTypeToUse;
       if (desiredContentType)
@@ -395,15 +338,13 @@ nsresult nsDocumentOpenInfo::DispatchContent(nsIRequest *request, nsISupports *
       else
         contentTypeToUse.Assign(contentType);
 
-        // We need to first figure out if we are retargeting the load
-        // to a content listener that is different from the one that
-        // originated the request....if so, set
+      // We need to first figure out if we are retargeting the load to a content listener
+      // that is different from the one that originated the request....if so, set
       // LOAD_RETARGETED_DOCUMENT_URI on the channel. 
 
-        if (contentListener != m_contentListener)
+      if (contentListener.get() != m_contentListener.get())
       {
-          // we must be retargeting...so set an appropriate flag on
-          // the channel
+         // we must be retargeting...so set an appropriate flag on the channel
         nsLoadFlags loadFlags = 0;
         aChannel->GetLoadFlags(&loadFlags);
         loadFlags |= nsIChannel::LOAD_RETARGETED_DOCUMENT_URI;
@@ -424,7 +365,6 @@ nsresult nsDocumentOpenInfo::DispatchContent(nsIRequest *request, nsISupports *
       if (NS_FAILED(rv) || bAbortProcess) {
         return rv;
       }
-      }
 
       // try to detect if there is a helper application we an use...
       if (!contentStreamListener)
diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp
index 8d02206b55e..ad1789eae28 100644
--- a/uriloader/exthandler/nsExternalHelperAppService.cpp
+++ b/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -743,7 +743,6 @@ nsExternalAppHandler::nsExternalAppHandler()
   NS_INIT_ISUPPORTS();
   mCanceled = PR_FALSE;
   mReceivedDispositionInfo = PR_FALSE;
-  mHandlingAttachment = PR_FALSE;
   mStopRequestIssued = PR_FALSE;
   mDataBuffer = (char *) nsMemory::Alloc((sizeof(char) * DATA_BUFFER_SIZE));
   mProgressListenerInitialized = PR_FALSE;
@@ -874,29 +873,10 @@ void nsExternalAppHandler::ExtractSuggestedFileNameFromChannel(nsIChannel* aChan
   // disposition-type < ; name=value >* < ; filename=value > < ; name=value >*
   if ( NS_SUCCEEDED( rv ) && !disp.IsEmpty() ) 
   {
-    nsCAutoString::const_iterator start, end;
+    nsACString::const_iterator start, end;
     disp.BeginReading(start);
     disp.EndReading(end);
-    // skip leading whitespace
-    while (start != end && nsCRT::IsAsciiSpace(*start)) {
-      ++start;
-    }
-    nsCAutoString::const_iterator iter = start;
-    // walk forward till we hit the next whitespace or semicolon
-    while (iter != end && *iter != ';' && !nsCRT::IsAsciiSpace(*iter)) {
-      ++iter;
-    }
-    if (start != iter &&
-        Substring(start, iter).Equals(NS_LITERAL_CSTRING("attachment"),
-                                      nsCaseInsensitiveCStringComparator())) {
-      mHandlingAttachment = PR_TRUE;
-    }
-
-    // We may not have a disposition type listed; some servers suck.
-    // But they could have listed a filename anyway.
-    disp.BeginReading(start);
-    iter = end;
-
+    nsACString::const_iterator iter = end;
     if (CaseInsensitiveFindInReadable(NS_LITERAL_CSTRING("filename="),
                                       start,
                                       iter))
@@ -921,7 +901,7 @@ void nsExternalAppHandler::ExtractSuggestedFileNameFromChannel(nsIChannel* aChan
         if (endChar == ';' && iter != start) {
           --iter;
           while (iter != start && nsCRT::IsAsciiSpace(*iter)) {
-            --iter;
+            iter--;
           }
           ++iter;
         }
@@ -1209,13 +1189,7 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo
   // they want us to do with this content...
 
   PRBool alwaysAsk = PR_TRUE;
-  // If we're handling an attachment we want to default to saving but
-  // always ask just in case
-  if (mHandlingAttachment) {
-    mMimeInfo->SetPreferredAction(nsIMIMEInfo::saveToDisk);
-  } else {
   mMimeInfo->GetAlwaysAskBeforeHandling(&alwaysAsk);
-  }
   if (alwaysAsk)
   {
     // do this first! make sure we don't try to take an action until the user tells us what they want to do
diff --git a/uriloader/exthandler/nsExternalHelperAppService.h b/uriloader/exthandler/nsExternalHelperAppService.h
index bcd1950867e..1d0a33b97a4 100644
--- a/uriloader/exthandler/nsExternalHelperAppService.h
+++ b/uriloader/exthandler/nsExternalHelperAppService.h
@@ -186,8 +186,6 @@ protected:
   PRPackedBool mReceivedDispositionInfo;
   PRPackedBool mStopRequestIssued; 
   PRPackedBool mProgressListenerInitialized;
-  // This is set when handling something with "Content-Disposition: attachment"
-  PRPackedBool mHandlingAttachment;
   PRInt64 mTimeDownloadStarted;
   PRInt32 mContentLength;
   PRInt32 mProgress; // Number of bytes received (for sending progress notifications).