diff --git a/ChangeLog b/ChangeLog
index f4979e47b..41bfadb66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-08-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Contacts/UIxContactsListViewContainer.m: container to make it
+	easier to manage both ajax and non-ajax requests.
+
 	* UI/Contacts/UIxContactsFilterPanel.m: clone of
 	UIxMailFilterPanel, but applicable to contact lists.
 
diff --git a/UI/Contacts/UIxContactsListViewContainer.h b/UI/Contacts/UIxContactsListViewContainer.h
new file mode 100644
index 000000000..17df6a2b4
--- /dev/null
+++ b/UI/Contacts/UIxContactsListViewContainer.h
@@ -0,0 +1,32 @@
+/* UIxContactsListViewContainer.h - this file is part of SOGo
+ *
+ * Copyright (C) 2006 Inverse groupe conseil
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef UIXCONTACTSLISTVIEWCONTAINER_H
+#define UIXCONTACTSLISTVIEWCONTAINER_H
+
+#import <SOGoUI/UIxComponent.h>
+
+@interface UIxContactsListViewContainer : UIxComponent
+
+@end
+
+#endif /* UIXCONTACTSLISTVIEWCONTAINER_H */
diff --git a/UI/Contacts/UIxContactsListViewContainer.m b/UI/Contacts/UIxContactsListViewContainer.m
new file mode 100644
index 000000000..7dfe58761
--- /dev/null
+++ b/UI/Contacts/UIxContactsListViewContainer.m
@@ -0,0 +1,27 @@
+/* UIxContactsListViewContainer.m - this file is part of $PROJECT_NAME_HERE$
+ *
+ * Copyright (C) 2006 Inverse groupe conseil
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#import "UIxContactsListViewContainer.h"
+
+@implementation UIxContactsListViewContainer
+
+@end
diff --git a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
new file mode 100644
index 000000000..13f075dbf
--- /dev/null
+++ b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
@@ -0,0 +1,90 @@
+<?xml version='1.0' standalone='yes'?>
+  <var:component
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:uix="OGo:uix"
+    xmlns:label="OGo:label"
+    xmlns:rsrc="OGo:url"
+    className="UIxPageFrame"
+    title="name"
+    >
+    <var:if condition="hideFrame" const:negate="YES">
+      <div class="menu" id="contactFolderMenu">
+        <ul>
+          <li
+            onmousedown="return false;"
+            onmouseup="return false;"><var:string label:value="Modify" /></li>
+          <li class="separator"></li>
+          <li
+            onmousedown="return false;"
+            onmouseup="return false;"><var:string label:value="New Card" /></li>
+          <li
+            onmousedown="return false;"
+            onmouseup="return false;"><var:string label:value="New List" /></li>
+          <li class="separator"></li>
+          <li
+            onmousedown="return false;"
+            onmouseup="return false;"><var:string label:value="Delete" /></li>
+        </ul>
+      </div>
+
+      <div class="menu" id="contactMenu">
+        <ul>
+          <li
+            onmousedown="return false;"
+            onmouseup="return onMenuEditContact(event, this);"><var:string label:value="Modify" /></li>
+          <li class="separator"></li>
+          <li
+            onmousedown="return false;"
+            onmouseup="return onMenuWriteToContact(event, this);"><var:string label:value="Write" /></li>
+          <li
+            onmousedown="return false;"
+            onmouseup="return false;"><var:string label:value="Instant Message" /></li>
+          <li class="separator"></li>
+          <li
+            onmousedown="return false;"
+            onmouseup="return onMenuDeleteContact(event, this);"><var:string label:value="Delete" /></li>
+        </ul>
+      </div>
+
+        <form name="searchform" var:href="view" var:_sort="sortKey"
+          method="GET">
+	<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="Addressbook" /></div>
+            </div>
+
+            <div id="dragHandle"
+              onmousedown="startHandleDragging(event);"
+              onmousemove=""
+              ondblclick="dragHandleDoubleClick(event);"
+              leftblock="contactFoldersList"
+              rightblock="contactsListContent">
+            </div>
+          </var:if>
+
+          <div id="contactsListContent">
+            <var:component-content/>
+          </div>
+        </var:if>
+
+	<var:if condition="isPopup">
+          <var:component-content/>
+        </var:if>
+      </form>
+
+      <var:string value="errorAlertJavaScript" const:escapeHTML="NO" />
+    </var:if>
+
+    <var:if condition="hideFrame">
+      <var:component-content/>
+    </var:if>
+  </var:component>
+
+  <var:if condition="isUIxDebugEnabled">
+    <hr />
+    <small>clientObject: <var:string value="clientObject" /></small>
+  </var:if>
+</var:component>