fixed bug 23133, 23136 - Send Link & Page not escaping page url and not generating href tag; r=ducarroz

mailnews/compose/resources/content/MsgComposeCommands.js

@@ -208,8 +208,20 @@ function ComposeStartup()
 	    	var msgCompFields = msgCompose.compFields;
 	    	if (msgCompFields)
 	    	{
-	    		if (args.body) //We need to set the body before setting msgCompose.editor;
-	    			msgCompFields.SetBody(args.body);
+	    		if (args.body) //We need to set the body before setting
+                               //msgCompose.editor;
+                {
+                    if (args.bodyislink == "true" && msgCompose.composeHTML)
+                    {
+                        msgCompFields.SetBody("<A HREF=\"" + args.body +
+                                                  "\">" + unescape(args.body)
+                                                  + "</A>");
+                    }
+                    else
+                    {
+                        msgCompFields.SetBody(args.body);
+                    }
+                }
 
 	    		if (args.to)
 	    			msgCompFields.SetTo(args.to);

xpfe/browser/resources/content/navigator.js

@@ -1230,14 +1230,18 @@ function BrowserEditBookmarks()
 
   function BrowserSendLink(pageUrl, pageTitle)
   {
-    window.openDialog( "chrome://messengercompose/content/", "_blank", "chrome,all,dialog=no",
-    	"body=" + pageUrl + ",subject='" + pageTitle + "'");
+    window.openDialog( "chrome://messengercompose/content/", "_blank", 
+                       "chrome,all,dialog=no",
+                       "body='" + pageUrl + "',subject='" + pageTitle +
+                       "',bodyislink=true");
   }
 
   function BrowserSendPage(pageUrl, pageTitle)
   {
-    window.openDialog( "chrome://messengercompose/content/", "_blank", "chrome,all,dialog=no",
-    	"attachment=" + escape(pageUrl) + ",body=" + pageUrl + ",subject='" + pageTitle + "'");
+    window.openDialog( "chrome://messengercompose/content/", "_blank", 
+                       "chrome,all,dialog=no", 
+                       "attachment='" + pageUrl + "',body='" + pageUrl +
+                       "',subject='" + pageTitle + "',bodyislink=true");
   }
 
   function BrowserViewSource()