diff --git a/ChangeLog b/ChangeLog
index 6525eaff1..fcfef5009 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-13  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/ContactsUI.js (-fixSearchFieldPosition):
+	replaced this function by the equivalent CSS definition.
+	(-initContacts): initialized import buttons even for "popup" mode.
+
 2010-01-12  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* SoObjects/SOGo/NSString+Utilities.m
diff --git a/UI/WebServerResources/ContactsUI.css b/UI/WebServerResources/ContactsUI.css
index 400fbe8bc..18f102d79 100644
--- a/UI/WebServerResources/ContactsUI.css
+++ b/UI/WebServerResources/ContactsUI.css
@@ -319,6 +319,11 @@ BODY.popup DIV#rightDragHandle
 BODY.popup DIV#contactView
 { top: 10em; }
 
+BODY.popup DIV#filterPanel
+{ position: relative;
+  top: 7px;
+}
+
 DIV.contactSelection
 {
   z-index: 10;
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 7fbfec507..bedf35647 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -1150,29 +1150,28 @@ function onDocumentKeydown(event) {
         }
 }
 
-function fixSearchFieldPosition () {
+/*function fixSearchFieldPosition () {
     var panel = $("filterPanel");
     if (panel) {
         panel.style.position = "relative";
         panel.style.top = "7px";
     }
-}
+    }*/
 
 function initContacts(event) {
     if ($(document.body).hasClassName("popup")) {
         configureSelectionButtons();
-        fixSearchFieldPosition ();
-    }
-    else {
-        // Addressbook import form
-        $("uploadCancel").observe("click", hideContactsImport);
-        $("uploadOK").observe("click", hideImportResults);
-
-        if (Prototype.Browser.Gecko)
-            Event.observe(document, "keypress", onDocumentKeydown); // for FF2
-        else
-            Event.observe(document, "keydown", onDocumentKeydown);        
     }
+    
+    // Addressbook import form
+    $("uploadCancel").observe("click", hideContactsImport);
+    $("uploadOK").observe("click", hideImportResults);
+    
+    if (Prototype.Browser.Gecko)
+        Event.observe(document, "keypress", onDocumentKeydown); // for FF2
+    else
+        Event.observe(document, "keydown", onDocumentKeydown);        
+    
     configureAbToolbar();
     configureAddressBooks();
     updateAddressBooksMenus();