diff --git a/mailnews/compose/src/nsMsgCompUtils.cpp b/mailnews/compose/src/nsMsgCompUtils.cpp
index d00a9a1df57b..92a5b194860b 100644
--- a/mailnews/compose/src/nsMsgCompUtils.cpp
+++ b/mailnews/compose/src/nsMsgCompUtils.cpp
@@ -1924,6 +1924,7 @@ GenerateFileNameFromURI(nsIURI *aURL)
     if (*cp)
     {
       if ((cp1 = PL_strchr(cp, '/'))) *cp1 = 0;  
+      if ((cp1 = PL_strchr(cp, '?'))) *cp1 = 0;  
       if (*cp != '\0')
       {
         returnString = PL_strdup(cp);