diff --git a/ChangeLog b/ChangeLog
index fe91e57e0..8956b264b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-06-16  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/UIxListEditor.js (onDocumentKeydown):
+	submit form when pressing the return key.
+
+	* UI/WebServerResources/UIxContactEditor.js (onDocumentKeydown):
+	idem.
+
+	* UI/WebServerResources/SOGoAutoCompletion.js
+	(performSearchCallback): fixed the position of the popup menu when
+	the input is within a relatively positioned div (mainly the
+	contacts list editor).
+
 2010-06-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Scheduler/UIxCalListingActions.m
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 3784a2e86..328dbd00f 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -224,7 +224,7 @@
       ><var:foreach list="columnsDisplayOrder" item="currentColumn">
         <th var:class="currentColumn.headerClass" var:id="currentColumn.headerId">
           <var:if condition="currentColumn.value" const:value="Flagged">
-            <img rsrc:src="empty.gif" width="100%" height="100%" const:title="" />
+            <entity name="nbsp"/>
           </var:if>
           <var:if condition="currentColumn.value" const:value="Attachment">
             <img rsrc:src="title_attachment_14x14.png" label:title="$currentColumn.value" width="14"
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index d67f76e25..dc37da726 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -1658,9 +1658,10 @@ function initMailer(event) {
         }
         else
             Event.observe(window, "beforeunload", onUnload);
+
+        onMessageListResize();
     }
   
-    onMessageListResize();
     onWindowResize.defer();
     Event.observe(window, "resize", onWindowResize);
 }
diff --git a/UI/WebServerResources/SOGoAutoCompletion.js b/UI/WebServerResources/SOGoAutoCompletion.js
index 2820ff16c..3891d8d19 100644
--- a/UI/WebServerResources/SOGoAutoCompletion.js
+++ b/UI/WebServerResources/SOGoAutoCompletion.js
@@ -191,9 +191,10 @@ var SOGoAutoCompletionInterface = {
                     }
 
                     // Show popup menu
+                    var div = Element.up(input, 'DIV');
                     var offsetScroll = Element.cumulativeScrollOffset(input);
                     var offset = Element.positionedOffset(input);
-                    if (offset.top < 50)
+                    if (div.getStyle('position') == 'relative')
                         // Hack for some situations where the offset must be computed differently
                         offset = Element.cumulativeOffset(input);
                     var top = offset.top - offsetScroll.top + node.offsetHeight + 3;
diff --git a/UI/WebServerResources/SOGoMailDataSource.js b/UI/WebServerResources/SOGoMailDataSource.js
index 5b04f51fc..b3f136e54 100644
--- a/UI/WebServerResources/SOGoMailDataSource.js
+++ b/UI/WebServerResources/SOGoMailDataSource.js
@@ -62,7 +62,7 @@ SOGoMailDataSource = Class.create({
                 }
             }
             else {
-                alert("SOGoMailDataSource._loadCallback Error " + http.status + ": " + http.responseText);
+                log("SOGoMailDataSource._loadCallback Error " + http.status + ": " + http.responseText);
             }
         },
         
diff --git a/UI/WebServerResources/UIxContactEditor.js b/UI/WebServerResources/UIxContactEditor.js
index 86ef8def2..f2467ff6c 100644
--- a/UI/WebServerResources/UIxContactEditor.js
+++ b/UI/WebServerResources/UIxContactEditor.js
@@ -136,6 +136,17 @@ function onEditorSubmitClick(event) {
     this.blur();
 }
 
+function onDocumentKeydown(event) {
+    var target = Event.element(event);
+    if (target.tagName == "INPUT" || target.tagName == "SELECT") {
+        if (event.keyCode == Event.KEY_RETURN) {
+            var fcn = onEditorSubmitClick.bind($("submitButton"));
+            fcn();
+            Event.stop(event);
+        }
+    }
+}
+
 function initEditorForm() {
     var tabsContainer = $("editorTabs");
     var controller = new SOGoTabsController();
@@ -148,6 +159,8 @@ function initEditorForm() {
 
     $("cancelButton").observe("click", onEditorCancelClick);
     $("submitButton").observe("click", onEditorSubmitClick);
+
+    Event.observe(document, "keydown", onDocumentKeydown);
 }
 
 document.observe("dom:loaded", initEditorForm);
diff --git a/UI/WebServerResources/UIxListEditor.js b/UI/WebServerResources/UIxListEditor.js
index 3613bae10..3b45bc476 100644
--- a/UI/WebServerResources/UIxListEditor.js
+++ b/UI/WebServerResources/UIxListEditor.js
@@ -140,6 +140,16 @@ function onEditorSubmitClick(event) {
     $("mainForm").submit();
 }
 
+function onDocumentKeydown(event) {
+    var target = Event.element(event);
+    if (target.tagName == "INPUT") {
+        if (event.keyCode == Event.KEY_RETURN && target.menu == null) {
+            onEditorSubmitClick(event);
+            Event.stop(event);
+        }
+    }
+}
+
 function initListEditor() {
     var table = $("referenceList");
     table.multiselect = true;
@@ -148,6 +158,8 @@ function initListEditor() {
     $("referenceDelete").observe("click", onReferenceDelete);
     $("cancelButton").observe("click", onEditorCancelClick);
     $("submitButton").observe("click", onEditorSubmitClick);
+
+    Event.observe(document, "keydown", onDocumentKeydown);
 }
 
 document.observe("dom:loaded", initListEditor);