--- a/mailnews/compose/src/nsMsgCompose.cpp
+++ b/mailnews/compose/src/nsMsgCompose.cpp
@@ -1747,17 +1747,17 @@ nsresult nsMsgCompose::CreateMessage(con
       reference.Append(NS_LITERAL_CSTRING("<"));
       reference.Append(messageId);
       reference.Append(NS_LITERAL_CSTRING(">"));
       // We're forwarding, which means we're composing a message that has no
       // references yet, so we can set the value safely
       m_compFields->SetReferences(reference.get());
     }
 
-    return rv;
+    return NS_OK;
   }
 
   char *uriList = PL_strdup(originalMsgURI);
   if (!uriList)
     return NS_ERROR_OUT_OF_MEMORY;
 
   nsCOMPtr<nsIMimeConverter> mimeConverter = do_GetService(NS_MIME_CONVERTER_CONTRACTID);