--- a/mailnews/base/util/nsMsgProtocol.cpp
+++ b/mailnews/base/util/nsMsgProtocol.cpp
@@ -669,29 +669,23 @@ NS_IMETHODIMP nsMsgProtocol::GetContentC
 }
 
 NS_IMETHODIMP nsMsgProtocol::SetContentCharset(const nsACString &aContentCharset)
 {
   NS_WARNING("nsMsgProtocol::SetContentCharset() not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-NS_IMETHODIMP nsMsgProtocol::GetContentDisposition(nsACString &aContentDisposition)
-{
-  aContentDisposition.Truncate();
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsMsgProtocol::GetContentLength(PRInt64 *aContentLength)
+NS_IMETHODIMP nsMsgProtocol::GetContentLength(PRInt32 *aContentLength)
 {
   *aContentLength = mContentLength;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsMsgProtocol::SetContentLength(PRInt64 aContentLength)
+NS_IMETHODIMP nsMsgProtocol::SetContentLength(PRInt32 aContentLength)
 {
   mContentLength = aContentLength;
   return NS_OK;
 }
 
 NS_IMETHODIMP nsMsgProtocol::GetSecurityInfo(nsISupports * *aSecurityInfo)
 {
   *aSecurityInfo = nsnull;

--- a/mailnews/base/util/nsMsgProtocol.h
+++ b/mailnews/base/util/nsMsgProtocol.h
@@ -183,17 +183,17 @@ protected:
   nsCOMPtr<nsIStreamListener> m_channelListener;
   nsCOMPtr<nsISupports>        m_channelContext;
   nsCOMPtr<nsILoadGroup>      m_loadGroup;
   nsLoadFlags                 mLoadFlags;
   nsCOMPtr<nsIProgressEventSink> mProgressEventSink;
   nsCOMPtr<nsIInterfaceRequestor> mCallbacks;
   nsCOMPtr<nsISupports>       mOwner;
   nsCString                   m_ContentType;
-  PRInt64                     mContentLength;
+  PRInt32                     mContentLength;
 
   nsCString m_lastPasswordSent; // used to prefill the password prompt
 
   // private helper routine used by subclasses to quickly get a reference to the correct prompt dialog
   // for a mailnews url. 
   nsresult GetPromptDialogFromUrl(nsIMsgMailNewsUrl * aMsgUrl, nsIPrompt ** aPromptDialog);
 
   // if a url isn't going to result in any content then we want to suppress calls to

--- a/mailnews/imap/src/nsImapProtocol.cpp
+++ b/mailnews/imap/src/nsImapProtocol.cpp
@@ -9238,30 +9238,24 @@ NS_IMETHODIMP nsImapMockChannel::GetCont
 }
 
 NS_IMETHODIMP nsImapMockChannel::SetContentCharset(const nsACString &aContentCharset)
 {
   NS_WARNING("nsImapMockChannel::SetContentCharset() not implemented");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-NS_IMETHODIMP nsImapMockChannel::GetContentDisposition(nsACString &aContentDisposition)
-{
-  aContentDisposition.Truncate();
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsImapMockChannel::GetContentLength(PRInt64 * aContentLength)
+NS_IMETHODIMP nsImapMockChannel::GetContentLength(PRInt32 * aContentLength)
 {
   *aContentLength = mContentLength;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsImapMockChannel::SetContentLength(PRInt64 aContentLength)
+nsImapMockChannel::SetContentLength(PRInt32 aContentLength)
 {
     mContentLength = aContentLength;
     return NS_OK;
 }
 
 NS_IMETHODIMP nsImapMockChannel::GetOwner(nsISupports * *aPrincipal)
 {
   *aPrincipal = mOwner;

--- a/mailnews/news/src/nsNntpMockChannel.cpp
+++ b/mailnews/news/src/nsNntpMockChannel.cpp
@@ -230,31 +230,25 @@ NS_IMETHODIMP nsNntpMockChannel::GetCont
 
 NS_IMETHODIMP nsNntpMockChannel::SetContentCharset(const nsACString &aCharset)
 {
   FORWARD_CALL(SetContentCharset, aCharset)
   m_contentCharset = aCharset;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsNntpMockChannel::GetContentDisposition(nsACString &aContentDisposition)
-{
-  aContentDisposition.Truncate();
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsNntpMockChannel::GetContentLength(PRInt64 *length)
+NS_IMETHODIMP nsNntpMockChannel::GetContentLength(PRInt32 *length)
 {
   FORWARD_CALL(GetContentLength, length)
   *length = m_contentLength;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsNntpMockChannel::SetContentLength(PRInt64 aLength)
+nsNntpMockChannel::SetContentLength(PRInt32 aLength)
 {
   FORWARD_CALL(SetContentLength, aLength)
   m_contentLength = aLength;
   return NS_OK;
 }
 
 ////////////////////////////////////////
 // nsIChannel and nsNNTPProtocol glue //