diff --git a/NEWS b/NEWS
index 1e64ec2ff..dc10533f5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 0.9.0-2008XXXX (1.0)
 --------------------
 - work around the situation where Courier IMAP would refuse to rename the current mailbox or move it into the trash
+- fixed tab index in mail composition window
+- fixed default privacy selection for new events
 
 0.9.0-20080520 (1.0 rc6)
 ------------------------
diff --git a/UI/WebServerResources/UIxComponentEditor.js b/UI/WebServerResources/UIxComponentEditor.js
index 9cc02b2ce..c50562371 100644
--- a/UI/WebServerResources/UIxComponentEditor.js
+++ b/UI/WebServerResources/UIxComponentEditor.js
@@ -63,8 +63,7 @@ function onMenuSetClassification(event) {
   this.addClassName("_chosen");
   this.parentNode.chosenNode = this;
 
-  //    log("classification: " + classification);
-  var privacyInput = document.getElementById("privacy");
+  var privacyInput = $("privacy");
   privacyInput.value = classification;
 }
 
@@ -95,19 +94,17 @@ function initializeDocumentHref() {
 
 function initializePrivacyMenu() {
   var privacy = $("privacy").value.toUpperCase();
-  if (privacy.length > 0) {
-    var privacyMenu = $("privacy-menu").childNodesWithTag("ul")[0];
-    var menuEntries = $(privacyMenu).childNodesWithTag("li");
-    var chosenNode;
-    if (privacy == "CONFIDENTIAL")
-      chosenNode = menuEntries[1];
-    else if (privacy == "PRIVATE")
-      chosenNode = menuEntries[2];
-    else
-      chosenNode = menuEntries[0];
-    privacyMenu.chosenNode = chosenNode;
-    $(chosenNode).addClassName("_chosen");
-  }
+  var privacyMenu = $("privacy-menu").childNodesWithTag("ul")[0];
+  var menuEntries = $(privacyMenu).childNodesWithTag("li");
+  var chosenNode;
+  if (privacy == "CONFIDENTIAL")
+    chosenNode = menuEntries[1];
+  else if (privacy == "PRIVATE")
+    chosenNode = menuEntries[2];
+  else
+    chosenNode = menuEntries[0];
+  privacyMenu.chosenNode = chosenNode;
+  $(chosenNode).addClassName("_chosen");
 }
 
 function onComponentEditorLoad(event) {
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index ac57bf05f..9c9152f4a 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -285,6 +285,17 @@ function onTextMouseDown(event) {
   }
 }
 
+function initTabIndex(addressList, subjectField, msgArea) {
+  
+  var i = 1;
+  addressList.select("input.textField").each(function (input) {
+      if (!input.readAttribute("readonly"))
+	input.writeAttribute("tabindex", i++);
+    });
+  subjectField.writeAttribute("tabindex", i++);
+  msgArea.writeAttribute("tabindex", i);
+}
+
 function initMailEditor() {
   var list = $("attachments");
   $(list).attachMenu("attachmentsMenu");
@@ -310,7 +321,9 @@ function initMailEditor() {
 //   textarea.observe("contextmenu", onTextContextMenu);
   textarea.observe("mousedown", onTextMouseDown, true);
 
+  initTabIndex(list, $$("div#subjectRow input").first(), textarea);
   onWindowResize(null);
+
   Event.observe(window, "resize", onWindowResize);
   Event.observe(window, "beforeunload", onMailEditorClose);