Bug 984119 - When creating e-mails from event dialog/summary dialog sender identity is preset with standard mail user. r=philipp

calendar/base/content/calendar-dnd-listener.js

@@ -435,7 +435,8 @@ calMailButtonDNDObserver.prototype = {
                 }
             }
 
-            sendMailTo(recipients, item.title, item.getProperty("DESCRIPTION"));
+            let identity = item.calendar.getProperty("imip.identity");
+            sendMailTo(recipients, item.title, item.getProperty("DESCRIPTION"), identity);
         }
     },
 

calendar/base/content/calendar-task-view.js

@@ -231,7 +231,8 @@ function sendMailToOrganizer() {
                                                 "emailSubjectReply",
                                                 [item.title]);
 
-                sendMailTo(email, emailSubject);
+                let identity = item.calendar.getProperty("imip.identity");
+                sendMailTo(email, emailSubject, null, identity);
             }
         }
     }

calendar/base/content/dialogs/calendar-event-dialog.js

@@ -3609,8 +3609,8 @@ function sendMailToAttendees(aAttendees) {
     var emailSubject = calGetString("calendar-event-dialog",
                                     "emailSubjectReply",
                                     [item.title]);
-
-    sendMailTo(toList, emailSubject);
+    let identity = window.calendarItem.calendar.getProperty("imip.identity");
+    sendMailTo(toList, emailSubject, null, identity);
 }
 
 /**

calendar/base/content/dialogs/calendar-summary-dialog.js

@@ -372,7 +372,8 @@ function sendMailToOrganizer() {
                                             "emailSubjectReply",
                                             [item.title]);
 
-            sendMailTo(email, emailSubject);
+            let identity = item.calendar.getProperty("imip.identity");
+            sendMailTo(email, emailSubject, null, identity);
         }
     }
 }

calendar/base/src/calUtils.js

@@ -1233,7 +1233,7 @@ calListenerBag.prototype = {
     }
 };
 
-function sendMailTo(aRecipient, aSubject, aBody) {
+function sendMailTo(aRecipient, aSubject, aBody, aIdentity) {
     let msgParams = Components.classes["@mozilla.org/messengercompose/composeparams;1"]
                               .createInstance(Components.interfaces.nsIMsgComposeParams);
     let composeFields = Components.classes["@mozilla.org/messengercompose/composefields;1"]
@@ -1246,6 +1246,7 @@ function sendMailTo(aRecipient, aSubject, aBody) {
     msgParams.type = Components.interfaces.nsIMsgCompType.New;
     msgParams.format = Components.interfaces.nsIMsgCompFormat.Default;
     msgParams.composeFields = composeFields;
+    msgParams.identity = aIdentity;
 
     MailServices.compose.OpenComposeWindowWithParams(null, msgParams);
 }