diff --git a/mozilla/mailnews/imap/src/nsImapUtils.cpp b/mozilla/mailnews/imap/src/nsImapUtils.cpp
index 7fb95357b64..1c78013d7bd 100644
--- a/mozilla/mailnews/imap/src/nsImapUtils.cpp
+++ b/mozilla/mailnews/imap/src/nsImapUtils.cpp
@@ -180,6 +180,8 @@ nsImapURI2FullName(const char* rootURI, const char* hostname, const char* uriStr
     nsAutoString uri; uri.AssignWithConversion(uriStr);
     nsAutoString fullName;
     if (uri.Find(rootURI) != 0) return NS_ERROR_FAILURE;
+    uri.Right(fullName, uri.Length() - strlen(rootURI));
+    uri = fullName;
     PRInt32 hostStart = uri.Find(hostname);
     if (hostStart <= 0) return NS_ERROR_FAILURE;
     uri.Right(fullName, uri.Length() - hostStart);