diff --git a/ChangeLog b/ChangeLog
index 7341d9a35..f6f5c6b05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-11-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Templates/ContactsUI/UIxContactsListViewContainer.wox: added
+	a toolbar with two buttons ("add" and "remove") to manage the
+	additional addressbooks a user might subscribe to.
+
 	* UI/WebServerResources/ContactsUI.js: added code to handle
 	"external addressbooks" from the Javascript point-of-view, by
 	extending existing methods and adding code for the "add ab" and
diff --git a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
index e51ad1b57..255360e4f 100644
--- a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
+++ b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
@@ -8,8 +8,7 @@
     xmlns:rsrc="OGo:url"
     className="UIxPageFrame"
     title="name"
-    popup="popup"
-    >
+    var:popup="isPopup">
     <var:if condition="hideFrame" const:negate="YES">
       <div class="menu" id="contactFolderMenu">
         <ul>
@@ -54,67 +53,91 @@
 <!--	var:if condition="isPopup" const:negate="YES"> -->
           <var:if condition="hideFolderTree" const:negate="YES">
             <div class="contactFoldersList" id="contactFoldersList">
-              <div class="titlediv"><var:string label:value="Address Books" /></div>
+              <div class="titlediv"
+              ><var:string label:value="Address Books"
+                /></div>
+            <var:if var:condition="isPopup" const:negate="YES"
+              ><div class="toolbar">
+                <a href="#" class="toolbarButton" onclick="return onAddressBookAdd(this);"
+                  ><span class="toolbarButton"
+                    ><img rsrc:src="add-contact.gif" label:title="Add..."
+                      /></span></a
+                  ><a href="#" class="toolbarButton" onclick="return onAddressBookRemove(this);"
+                  ><span class="toolbarButton"
+                    ><img rsrc:src="remove-contact.gif" label:title="Remove"
+                      /></span></a
+                  ></div></var:if>
 
-              <ul id="contactFolders" onselectionchange="onFolderSelectionChange();">
-                <var:foreach list="contactFolders" item="currentFolder">
-                  <var:if condition="isFolderCurrent"
-                    ><li var:id="currentContactFolderId"
-                      class="_selected"
-                      onmousedown="return false;"
-                      onclick="return onRowClick(event);"
-                      oncontextmenu="return onContactFolderContextMenu(event);"
-                      ><var:string value="currentContactFolderName" /></li
-                      ></var:if
-                    ><var:if condition="isFolderCurrent"
-                    const:negate="YES"
-                    ><li var:id="currentContactFolderId"
-                      onmousedown="return false;"
-                      onclick="return onRowClick(event);"
-                      oncontextmenu="return onContactFolderContextMenu(event);"
-                      ><var:string value="currentContactFolderName" /></li
-                      ></var:if>
-                </var:foreach>
-              </ul>
+            <ul id="contactFolders"
+              onselectionchange="onFolderSelectionChange();"
+              var:additional-addressbooks="additionalAddressBooks">
+              <var:foreach list="contactFolders" item="currentFolder"
+                ><var:if condition="isFolderCurrent"
+                  ><li var:id="currentContactFolderId"
+                    class="_selected"
+                    onmousedown="return false;"
+                    onclick="return onRowClick(event);"
+                    oncontextmenu="return onContactFolderContextMenu(event);"
+                    ><var:string value="currentContactFolderName" /></li
+                    ></var:if
+                  ><var:if condition="isFolderCurrent"
+                  const:negate="YES"
+                  ><li var:id="currentContactFolderId"
+                    onmousedown="return false;"
+                    onclick="return onRowClick(event);"
+                    oncontextmenu="return onContactFolderContextMenu(event);"
+                    ><var:string value="currentContactFolderName" /></li
+                    ></var:if>
+              </var:foreach
+                ><var:foreach list="additionalFolders"
+                item="currentAdditionalFolder"
+                ><li var:id="currentAdditionalFolder"
+                  var:external-addressbook="currentAdditionalFolder"
+                  onmousedown="return false;"
+                  onclick="return onRowClick(event);"
+                  oncontextmenu="return onContactFolderContextMenu(event);"
+                  ><var:string value="currentAdditionalFolder" /></li
+                  ></var:foreach>
+            </ul>
 
             <var:if condition="hasContactSelectionButtons">
               <div class="contactSelection">
                 <var:component value="selectorComponent" />
               </div>
             </var:if>
-            </div>
-
-            <div class="dragHandle" id="dragHandle"
-              onmousedown="startHandleDragging(event);"
-              onmousemove=""
-              ondblclick="dragHandleDoubleClick(event);"
-              leftblock="contactFoldersList"
-              rightblock="rightPanel">
-            </div>
-          </var:if>
-
-          <div id="rightPanel">
-            <var:component className="UIxContactsFilterPanel" qualifier="qualifier" />
-
-            <div id="contactsListContent">
-              <var:component-content />
-            </div>
-
-            <div id="rightDragHandle"
-              class="dragHandle"
-              onmousedown="startHandleDragging(event);"
-              onmousemove=""
-              upperblock="contactsListContent"
-              lowerblock="contactView">
-            </div>
-
-            <div id="contactView" onmousedown="return false;"
-              ></div>
           </div>
-<!--          /var:if> -->
 
-<!--	var:if condition="isPopup">
-          var:component-content />
+          <div class="dragHandle" id="dragHandle"
+            onmousedown="startHandleDragging(event);"
+            onmousemove=""
+            ondblclick="dragHandleDoubleClick(event);"
+            leftblock="contactFoldersList"
+            rightblock="rightPanel">
+          </div>
+        </var:if>
+
+        <div id="rightPanel">
+          <var:component className="UIxContactsFilterPanel" qualifier="qualifier" />
+
+          <div id="contactsListContent">
+            <var:component-content />
+          </div>
+
+          <div id="rightDragHandle"
+            class="dragHandle"
+            onmousedown="startHandleDragging(event);"
+            onmousemove=""
+            upperblock="contactsListContent"
+            lowerblock="contactView">
+          </div>
+
+          <div id="contactView" onmousedown="return false;"
+            ></div>
+        </div>
+        <!--          /var:if> -->
+
+        <!--	var:if condition="isPopup">
+        var:component-content />
         /var:if> -->
       </form>