diff --git a/ChangeLog b/ChangeLog
index fc8949637..1a4b1c0ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentObject.m: don't take an
+	empty c_name as a valid response when looking up an event. Create
+	one in that case instead.
+
 2007-11-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/PreferencesUI/UIxPreferences.m ([UIxPreferences -signature]):
diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index dac2f2547..b8814b8e7 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -73,6 +73,8 @@
 	  if ([object isKindOfClass: [NSException class]])
 	    object = nil;
 	}
+      else
+	object = nil;
     }
 
   if (!object)
@@ -310,7 +312,8 @@
       ex = [self saveContentString: newContent];
       if (!(ex || [event userIsOrganizer: [context activeUser]]))
 	{
-	  if ([[attendee rsvp] isEqualToString: @"true"])
+	  if ([[attendee rsvp] isEqualToString: @"true"]
+	      && [event isStillRelevant])
 	    [self sendResponseToOrganizer];
 	  organizerUID = [[event organizer] uid];
 	  if (organizerUID)
diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 090e69f66..4609c7b9c 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -54,7 +54,7 @@
 	    /></div>
     <!-- separator line --><hr/>
     </div>
-    <textarea name="text" rows="30" var:value="text"/>
+    <textarea id="text" name="text" rows="30" var:value="text"/>
     <!-- img rsrc:src="tbird_073_compose.png" alt="screenshot" / -->
   </form>
 </var:component>
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index 54846025a..686d5bdc0 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -1,4 +1,5 @@
 var contactSelectorAction = 'mailer-contacts';
+var signatureLength = 0;
 
 function onContactAdd() {
   var selector = null;
@@ -240,6 +241,16 @@ function clickedEditorSave(sender) {
   return false;
 }
 
+function onTextFocus() {
+  this.insertBefore(document.createTextNode("\r\n"),
+		    this.lastChild);
+  if (signatureLength > 0) {
+    var length = this.getValue().length - signatureLength - 1;
+    this.setSelectionRange(length, length);
+  }
+  Event.stopObserving(this, "focus", onTextFocus);
+}
+
 function initMailEditor() {
   var list = $("attachments");
   $(list).attachMenu("attachmentsMenu");
@@ -256,6 +267,14 @@ function initMailEditor() {
   var list = $("addressList");
   TableKit.Resizable.init(list, {'trueResize' : true, 'keepWidth' : true});
 
+  var textarea = $("text");
+  var textContent = textarea.getValue();
+  var sigLimit = textContent.lastIndexOf("--");
+  if (sigLimit > -1)
+    signatureLength = (textContent.length - sigLimit);
+  Event.observe(textarea, "focus",
+		onTextFocus.bindAsEventListener(textarea));
+
   onWindowResize(null);
   Event.observe(window, "resize", onWindowResize);
   Event.observe(window, "beforeunload", onMailEditorClose);
diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css
index 3b6c58a49..38fd841b2 100644
--- a/UI/WebServerResources/generic.css
+++ b/UI/WebServerResources/generic.css
@@ -196,8 +196,7 @@ DIV, TEXTAREA, INPUT, SELECT
   font-size: inherit; }
 
 TEXTAREA, INPUT.textField
-{ padding: 0px;
-  margin: .15em;
+{ margin: 1px;
   border-bottom: 1px solid #fff;
   border-right: 1px solid #fff;
   border-top: 2px solid #222;
@@ -205,8 +204,13 @@ TEXTAREA, INPUT.textField
   -moz-border-top-colors: #9c9a94 #000 transparent;
   -moz-border-left-colors: #9c9a94 #000 transparent; }
 
+TEXTAREA
+{ padding: 0px;
+  padding-left: 2px; }
+
 INPUT.textField
-{ vertical-align: middle; }
+{ padding: 2px;
+  vertical-align: middle; }
 
 DIV#toolbar
 { left: 0px;