diff --git a/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp b/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp
index 6c2120756f4..020f0bcd87c 100644
--- a/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp
@@ -1768,6 +1768,8 @@ GenerateFileNameFromURI(nsIURI *aURL)
         return returnString;
       }
     }
+    else
+      return nsnull;
   }
 
   cp = nsnull;
@@ -1792,7 +1794,7 @@ GenerateFileNameFromURI(nsIURI *aURL)
 
     char *hostStr = nsMsgParseURLHost(cp2);
     if (!hostStr)
-      hostStr = cp2;
+      hostStr = PL_strdup(cp2);
 
     PRBool isHTTP = PR_FALSE;
     if (NS_SUCCEEDED(aURL->SchemeIs("http", &isHTTP)) && isHTTP)