diff --git a/ChangeLog b/ChangeLog
index f5125c214..439a21801 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2006-08-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Templates/ContactsUI/UIxContactsListViewContainer.wox: added
+	JS code to initialize the 'currentContactFolder' generic var.
+
+	* SoObjects/Contacts/SOGoContactFolder.m ([SOGoContactFolder
+	+contactFolderWithSource:inContainer:andName:]): new class
+	method meant to return an instance connected to the specified
+	source. Currently useless but won't be anymore in the next few
+	days.
+
 	* SoObjects/SOGo/SOGoUserFolder.h: commented out declaration of
 	the "lookupFreeBusyObject" method since it does not exist.
 
diff --git a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
index 0b73c7bdc..c64925d67 100644
--- a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
+++ b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
@@ -66,12 +66,12 @@
           </var:if>
 
           <div id="contactsListContent">
-            <var:component-content/>
+            <var:component-content />
           </div>
         </var:if>
 
 	<var:if condition="isPopup">
-          <var:component-content/>
+          <var:component-content />
         </var:if>
       </form>
 
@@ -79,12 +79,10 @@
     </var:if>
 
     <var:if condition="hideFrame">
-      <var:component-content/>
+      <var:component-content />
     </var:if>
-  </var:component>
 
-  <var:if condition="isUIxDebugEnabled">
-    <hr />
-    <small>clientObject: <var:string value="clientObject" /></small>
-  </var:if>
-</var:component>
+    <script type="text/javascript">
+      currentContactFolder = '<var:string value="contactFolderName" />';
+    </script>
+  </var:component>