diff --git a/ChangeLog b/ChangeLog
index 503f1b924..285c1790f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-07-25  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* SoObjects/Appointments/SOGoCalendarComponent.m
+	(-sendEMailUsingTemplateNamed:forObject:previousObject:toAttendees:withType:):
+	fixed the from header when the updated event has no mode organizer.
+
+	* UI/WebServerResources/MailerUI.js (initMailer): define default
+	columns widths when not set.
+
 2012-07-24  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/UIxPreferences.js (savePreferences):
diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m
index 11ff46f81..6c4c9ee97 100644
--- a/SoObjects/Appointments/SOGoCalendarComponent.m
+++ b/SoObjects/Appointments/SOGoCalendarComponent.m
@@ -766,17 +766,16 @@
       if (count)
 	{
 	  /* sender */
-	  //currentUser = [context activeUser];
-	  //shortSenderEmail = [[currentUser allEmails] objectAtIndex: 0];
-	  //  senderEmail = [NSString stringWithFormat: @"%@ <%@>",
-	  //			  [ownerUser cn], shortSenderEmail];
 	  shortSenderEmail = [[object organizer] rfc822Email];
-	  if (![shortSenderEmail length])
-	    shortSenderEmail = [[previousObject organizer] rfc822Email];
-	  senderEmail = [[object organizer] mailAddress];
-// 	  NSLog (@"sending '%@' from %@",
-// 		 [(iCalCalendar *) [object parent] method], senderEmail);
-	  /* generate iCalString once */
+	  if ([shortSenderEmail length])
+            {
+              senderEmail = [[object organizer] mailAddress];
+            }
+          else
+            {
+              shortSenderEmail = [[previousObject organizer] rfc822Email];
+              senderEmail = [[previousObject organizer] mailAddress];
+            }
 
           /* calendar part */
           eventBodyPart = [self _bodyPartForICalObject: object];
@@ -785,7 +784,6 @@
 	  app = [WOApplication application];
 
 	  /* generate dynamic message content */
-
 	  for (i = 0; i < count; i++)
 	    {
 	      attendee = [attendees objectAtIndex: i];
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 25af280f4..d75dd72bd 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -1966,6 +1966,9 @@ function initMailer(event) {
         if (UserSettings["Mail"] && UserSettings["Mail"]["ColumnsState"]) {
             messageListHeader.restore($H(UserSettings["Mail"]["ColumnsState"]));
         }
+        else {
+            messageListHeader.restore();
+        }
 
         configureDraggables();
         configureMessageListEvents();