diff --git a/mozilla/mailnews/imap/src/nsImapProtocol.cpp b/mozilla/mailnews/imap/src/nsImapProtocol.cpp
index 1dd44aa22b5..955d44d5e9f 100644
--- a/mozilla/mailnews/imap/src/nsImapProtocol.cpp
+++ b/mozilla/mailnews/imap/src/nsImapProtocol.cpp
@@ -6299,7 +6299,9 @@ NS_IMETHODIMP nsImapMockChannel::GetLoadGroup(nsILoadGroup * *aLoadGroup)
 
 NS_IMETHODIMP nsImapMockChannel::GetOriginalURI(nsIURI * *aURI)
 {
-    *aURI = m_originalUrl;
+// IMap does not seem to have the notion of an original URI :-(
+//  *aURI = m_originalUrl;
+    *aURI = m_url;
     NS_IF_ADDREF(*aURI);
     return NS_OK; 
 }