diff --git a/ChangeLog b/ChangeLog
index c1d015bec..6c7c60993 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-07-28  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Templates/MailerUI/UIxMailPanelFrame.wox: the components
+	using that container-template are now using UIxMailMainFrame
+	since UIxMailPanelFrame had no real interest. File removed.
+
 	* UI/WebServerResources/dtree.{css,js}: new files to handle
 	javascript-generated mailbox tree. Modified from original version
 	by integrating the previous code with the one we are using for
diff --git a/UI/Templates/MailerUI/UIxMailPanelFrame.wox b/UI/Templates/MailerUI/UIxMailPanelFrame.wox
deleted file mode 100644
index 9bf352252..000000000
--- a/UI/Templates/MailerUI/UIxMailPanelFrame.wox
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<container xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:var="http://www.skyrix.com/od/binding"
-      xmlns:const="http://www.skyrix.com/od/constant"
-      xmlns:rsrc="OGo:url"
-      xmlns:label="OGo:label"
->
-  <var:if condition="hideFrame" const:negate="YES">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:var="http://www.skyrix.com/od/binding"
-      xmlns:const="http://www.skyrix.com/od/constant"
-      xmlns:rsrc="OGo:url"
-      xmlns:label="OGo:label"
->
-  <head>
-    <title>
-      <var:string value="title"/>
-    </title>
-    
-    <meta name="templatename" content="UIXMailPanelFrame.wox"/>
-    <meta name="description" content="SOGo Web Interface"/>
-    <meta name="author" content="SKYRIX Software AG"/>
-    <meta name="robots" content="stop"/>
-    
-    <var:js-stringtable const:framework="MailerUI.SOGo"
-                        const:identifier="labels"
-                        const:inplace="NO"
-    />
-    <script rsrc:src="generic.js"> <!-- space required --></script>
-    <script rsrc:src="mailer.js" > <!-- space required --></script>
-
-	  <var:if condition="hasProductSpecificJavaScript">
-	    <script var:src="productJavaScriptURL"> <!-- space required --></script>
-	  </var:if>
-	  <var:if condition="hasPageSpecificJavaScript">
-	    <script var:src="pageJavaScriptURL"> <!-- space required --></script>
-	  </var:if>
-    
-    <link type="text/css" rel="stylesheet" rsrc:href="uix.css"    />
-    <link type="text/css" rel="stylesheet" rsrc:href="mailer.css" />
-    <link type="text/css" rel="stylesheet" rsrc:href="mailer-toolbar.css" />
-    <link type="text/css" rel="stylesheet" rsrc:href="mailer-compose.css" />
-
-    <link href="mailto:info@skyrix.com" rev="made"/>
-  </head>
-
-  <body>
-   <!-- 
-     Note: the 'href' is required, otherwise an element-id will get created
-     -->
-   <form name="pageform" var:href="pageFormURL" _wosid="0">
-
-     <var:if condition="showLinkBanner">
-       <table cellpadding="5" cellspacing="0" border="0" class="linkbanner">
-         <tr>
-          <td colspan="2">
-            <table cellpadding="0" cellspacing="0" border="0" width="100%">
-              <tr>
-                <td class="linkbannerlinks">
-                  <a var:href="relativeHomePath"
-                  ><var:string label:value="Home" /></a> |
-                  <a var:href="relativeCalendarPath"
-                  ><var:string label:value="Calendar" /></a> |
-                  <a var:href="relativeContactsPath"
-                  ><var:string label:value="Addressbook" /></a> |
-                  <a var:href="relativeMailPath"
-                  ><var:string label:value="Mail" /></a> |
-                  <a href="http://to.be.done/"
-                  ><var:string label:value="Right Administration" /></a>
-                </td>
-                <td class="linkbannerimage">
-                  <a href="http://www.opengroupware.org:80/" target="OGo">
-                    <img rsrc:src="CommonUI.SOGo/menu_logo_top.gif"
-                         align="center" border="0" alt="OGo Logo" 
-                         valign="middle"
-                    />
-                  </a>
-                </td>
-              </tr>
-            </table>
-	    
-            <!-- TODO: replace the line with a CSS straight line -->
-            <table cellpadding="0" cellspacing="0" border="0" width="100%">
-              <tr>
-                <td class="linecolor"><img 
-                    rsrc:src="CommonUI.SOGo/line_left.gif"/></td>
-                <td class="linecolor" width="98%">
-                  <img rsrc:src="CommonUI.SOGo/line_stretch.gif"/>
-                </td>
-                <td class="linecolor"><img 
-                    rsrc:src="CommonUI.SOGo/line_right.gif"/></td>
-              </tr>
-              <tr>
-                <td valign="top" colspan="2">
-                  <var:component className="UIxAppNavView" />
-                </td>
-                <td valign="top" align="right" class="button_submit_env">
-                  <a var:href="helpURL"
-                     class="button_submit"
-                     label:string="Help"
-                     var:target="helpWindowTarget"
-                  />
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </var:if>
-
-    <var:component className="UIxToolbar" />
-   
-    <div class="pageContent">
-      <var:component-content/>
-    </div>
-   </form>
-
-   <var:string value="errorAlertJavaScript" const:escapeHTML="NO" />
-  </body>
-</html>
-   </var:if>
-
-  <var:if condition="hideFrame">
-    <var:component-content/>
-  </var:if>
-</container>
