diff --git a/ChangeLog b/ChangeLog
index 2312c00a1..ae3a51379 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-01-17  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/WebServerResources/UIxFilterEditor.js (setupNewFilterData):
+	mark new filter as active by default.
+
+2012-01-17  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/UIxPreferences.js (initPreferences): When
+	the mail composer is set to use HTML, the reply position popup
+	menu is disabled. When switching to text-based message,
+	the popup menu is now correctly re-enabled.
+
 2012-01-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SQLSource.m (_lookupContactEntry:considerEmail:)
diff --git a/UI/WebServerResources/UIxFilterEditor.js b/UI/WebServerResources/UIxFilterEditor.js
index 3755c4a06..6276e4f73 100644
--- a/UI/WebServerResources/UIxFilterEditor.js
+++ b/UI/WebServerResources/UIxFilterEditor.js
@@ -182,7 +182,8 @@ function createFilterAction() {
 
 function setupNewFilterData() {
     var newFilterTemplate = $({ name: _("Untitled Filter"),
-                                match: "any" });
+                                match: "any",
+                                active: true });
     newFilterTemplate.rules = $([ createFilterRule() ]);
     newFilterTemplate.actions = $([ createFilterAction() ]);
 
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index f640d0244..b31a28d95 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -109,10 +109,10 @@ function _setupEvents() {
     // We check for non-null elements as replyPlacementList and composeMessagesType
     // might not be present if ModulesConstraints disable those elements
     if ($("replyPlacementList"))
-    	$("replyPlacementList").observe ("change", onReplyPlacementListChange);
+    	$("replyPlacementList").observe("change", onReplyPlacementListChange);
 
     if ($("composeMessagesType"))
-    	$("composeMessagesType").observe ("change", onComposeMessagesTypeChange);
+    	$("composeMessagesType").observe("change", onComposeMessagesTypeChange);
 
     // Note: we also monitor changes to the calendar categories.
     // See functions endEditable and onColorPickerChoice.
@@ -188,15 +188,24 @@ function initPreferences() {
     }
 
     // Disable placement (after) if composing in HTML
-    if ($("composeMessagesType")) {
-        if ($("composeMessagesType").value == 1) {
-            $("replyPlacementList").selectedIndex = 0;
-            $("replyPlacementList").disabled = 1;
+    var button = $("composeMessagesType");
+    if (button) {
+        if (button.value == 1) {
+            $("replyPlacementList").value = 0;
+            $("replyPlacementList").disabled = true;
         }
         onReplyPlacementListChange();
+        button.on("change", function(event) {
+            if (this.value == 0)
+                $("replyPlacementList").disabled = false;
+            else {
+                $("replyPlacementList").value = 0;
+                $("replyPlacementList").disabled = true;
+            }
+        });
     }
 
-    var button = $("addDefaultEmailAddresses");
+    button = $("addDefaultEmailAddresses");
     if (button)
         button.observe("click", addDefaultEmailAddresses);