From 96ada7e259cf050870b2688a48bea2d61e0f9fde Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@gmx.net>
Date: Thu, 29 May 2008 10:20:30 +0000
Subject: [PATCH] [muttator] add -subject= to m and M mappings

---
 content/mail.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/content/mail.js b/content/mail.js
index fa63f6df..217e9e76 100644
--- a/content/mail.js
+++ b/content/mail.js
@@ -169,7 +169,15 @@ liberator.Mail = function () //{{{
             tree.view.selection.timedSelect(c + folder, tree._selectDelay);
     }
 
-    function composeNewMail(args) {
+    function escapeRecipient(recipient)
+    {
+        // strip all ":
+        recipient = recipient.replace(/"/g, "");
+        return "\"" + recipient + "\"";
+    }
+
+    function composeNewMail(args)
+    {
         var params = Components.classes["@mozilla.org/messengercompose/composeparams;1"]
                        .createInstance(Components.interfaces.nsIMsgComposeParams);
         params.composeFields = Components.classes["@mozilla.org/messengercompose/composefields;1"]
@@ -343,7 +351,7 @@ liberator.Mail = function () //{{{
     // SENDING MESSAGES
     liberator.mappings.add(modes, ["m"],
         "Compose a new message",
-        function () { liberator.commandline.open(":", "message ", liberator.modes.EX); });
+        function () { liberator.commandline.open(":", "message -subject=", liberator.modes.EX); });
 
     liberator.mappings.add(modes, ["M"],
         "Compose a new message to the sender of selected mail",
@@ -351,8 +359,8 @@ liberator.Mail = function () //{{{
         { 
           try
           {
-            var to = gDBView.hdrForFirstSelectedMessage.mime2DecodedAuthor;
-            liberator.commandline.open(":", "message \"" + to + "\"", liberator.modes.EX);
+            var to = escapeRecipient(gDBView.hdrForFirstSelectedMessage.mime2DecodedAuthor);
+            liberator.commandline.open(":", "message " + to + " -subject=", liberator.modes.EX);
           }
           catch (e) { liberator.beep(); }
         });