diff --git a/ChangeLog b/ChangeLog
index f0d00d77f..337c9a0ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-07-05  Wolfgang Sourdeau  <wolfgang@contre.com>
+
+	* UI/Templates/UIxPageFrame.wox: use the exact html code as below.
+
+	* UI/Templates/MailerUI/UIxMailMainFrame.wox: redone the
+	linkbanner as a DIV instead of a TABLE.
+
+	* UI/MailerUI/UIxMailMainFrame.m [UIxMailMainFrame
+	showLinkBanner]:
+	returns 'YES' to request the display of the navigation bar between
+	applets.
+
 2006-06-15      ludovic@inverse.ca
 
         * It's now possible to set the default
diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m
index 9a6915e45..8a9d08604 100644
--- a/UI/MailerUI/UIxMailMainFrame.m
+++ b/UI/MailerUI/UIxMailMainFrame.m
@@ -150,11 +150,13 @@ static NSString *treeRootClassName = nil;
 }
 
 - (BOOL)showLinkBanner {
-  return NO;
+  return YES;
 }
+
 - (NSString *)bannerToolbarStyle {
   return nil;
 }
+
 - (NSString *)bannerConsumeStyle {
   return nil;
 }
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 4c0f6c329..eba8b7573 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -1,163 +1,121 @@
 <?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"
+  <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"
 >
-  <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>
+	<head>
+	  <title>
+	    <var:string value="title"/>
+	  </title>
     
-    <meta name="description" content="SOGo Web Interface"/>
-    <meta name="author" content="SKYRIX Software AG"/>
-    <meta name="robots" content="stop"/>
+	  <meta name="description" content="SOGo Web Interface"/>
+	  <meta name="author" content="SKYRIX Software AG"/>
+	  <meta name="robots" content="stop"/>
     
-    <script rsrc:src="generic.js"> <!-- space required --></script>
-    <script rsrc:src="mailer.js" > <!-- space required --></script>
+	  <script rsrc:src="generic.js"> <!-- space required --></script>
+	  <script rsrc:src="mailer.js" > <!-- space required --></script>
     
-    <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="uix.css"/>
+	  <link type="text/css" rel="stylesheet" rsrc:href="mailer.css"/>
+	  <link type="text/css" rel="stylesheet" rsrc:href="mailer-toolbar.css"/>
 
-    <link href="mailto:info@skyrix.com" rev="made"/>
-  </head>
+	  <link href="mailto:info@skyrix.com" rev="made"/>
+	</head>
 
-  <body style="background-color: #D4D0C8;">
-   <!-- 
-     Note: the 'href' is required, otherwise an element-id will get created
-     -->
-   <form name="pageform" var:href="pageFormURL" _wosid="0">
+	<body>
+	  <!-- 
+	  Note: the 'href' is required, otherwise an element-id will get created
+	  -->
+	  <var:if condition="showLinkBanner">
+	    <div class="linkbanner">
+	      <!-- span style="float: left" -->
+	      <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>
+	    </div>
+	  </var:if>
 
-     <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>
+	  <form name="pageform" var:href="pageFormURL" _wosid="0">
+
+	    <table border="0" class="tb_maintable" cellspacing="0" cellpadding="2"
+	      var:style="bannerToolbarStyle">
+	      <!-- this table is required for right alignment -->
+	      <tr>
+		<td valign="top" class="vertframerow">
+		  <var:component className="UIxMailToolbar" />
+		</td>
+		<td align="right" width="80" class="vertframerow">
+		  <table border="0"> <!-- TODO: what is this table for? -->
+		    <tr>
+		      <td class="tb_logocell tb_icon"
+			><div class="tbicon_logo"> </div></td>
+		    </tr>
+		  </table>
+		</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>
+	    <!-- consume toolbar -->
+	    <div class="tb_consumer" var:style="bannerConsumeStyle"> </div>
+	    
+	    <table border="0" width="100%" cellspacing="0" cellpadding="2">
+	      <tr class="vertframerow">
+		<td width="100%" valign="top" class="vertframerow" colspan="2">
+		  <var:if condition="hideFolderTree">
+		    <var:component-content/>
+		  </var:if>
+		  
+		  <var:if condition="hideFolderTree" const:negate="YES">
+		    <table width="100%">
+		      <tr>
+			<td width="25%" valign="top" class="foldercell">
+			  <div class="titlediv"
+			    ><var:string label:value="Folders" /></div>
+			  <div style="height: 95%">
+			    <div class="embedwhite_out">
+			      <div class="embedwhite_in">
+				<var:component className="UIxMailTree" 
+				  rootClassName="treeRootClassName" 
+				  const:treeFolderAction="view" 
+				  />
+			      </div>
+			    </div>
+			  </div>
+			</td>
+			<td style="width: 6px;"> </td>
+			<td valign="top" class="contentcell">
+			  <var:component-content/>
+			</td>
+		      </tr>
+		    </table>
+		  </var:if>
+		</td>
+	      </tr>
+	    </table>
+	  </form>
+
+	  <var:string value="errorAlertJavaScript" const:escapeHTML="NO" />
+	</body>
+      </html>
     </var:if>
 
-    <table border="0" class="tb_maintable" cellspacing="0" cellpadding="2"
-           var:style="bannerToolbarStyle">
-      <!-- this table is required for right alignment -->
-      <tr>
-        <td valign="top" class="vertframerow">
-          <var:component className="UIxMailToolbar" />
-        </td>
-        <td align="right" width="80" class="vertframerow">
-          <table border="0"> <!-- TODO: what is this table for? -->
-            <tr>
-              <td class="tb_logocell tb_icon"
-                  ><div class="tbicon_logo"> </div></td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-    
-    <!-- consume toolbar -->
-    <div class="tb_consumer" var:style="bannerConsumeStyle"> </div>
-    
-    <table border="0" width="100%" cellspacing="0" cellpadding="2">
-      <tr class="vertframerow">
-        <td width="100%" valign="top" class="vertframerow" colspan="2">
-          <var:if condition="hideFolderTree">
-            <var:component-content/>
-          </var:if>
-          
-          <var:if condition="hideFolderTree" const:negate="YES">
-            <table width="100%">
-              <tr>
-                <td width="25%" valign="top" class="foldercell">
-                  <div class="titlediv"
-                       ><var:string label:value="Folders" /></div>
-                  <div style="height: 95%">
-                    <div class="embedwhite_out">
-                      <div class="embedwhite_in">
-                        <var:component className="UIxMailTree" 
-                           rootClassName="treeRootClassName" 
-                           const:treeFolderAction="view" 
-                           />
-                      </div>
-                    </div>
-                  </div>
-                </td>
-                <td style="width: 6px;"> </td>
-                <td valign="top" class="contentcell">
-                  <var:component-content/>
-                </td>
-              </tr>
-            </table>
-          </var:if>
-        </td>
-      </tr>
-    </table>
-   </form>
-
-   <var:string value="errorAlertJavaScript" const:escapeHTML="NO" />
-  </body>
-</html>
-   </var:if>
-
-  <var:if condition="hideFrame">
-    <var:component-content/>
-  </var:if>
-</container>
+    <var:if condition="hideFrame">
+      <var:component-content/>
+    </var:if>
+  </container>
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 5702e0864..1ac4a278c 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -25,55 +25,47 @@
   </head>
 
   <body>
+    <div class="linkbanner">
+      <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>
+    </div>
+
     <table cellpadding="5" cellspacing="0" border="0" width="100%">
-      <tr>
-        <td colspan="2">
-          <table cellpadding="0" cellspacing="0" border="0" width="100%">
-            <tr>
-              <td valign="bottom" style="font-size: 10pt;">
-                <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="Administration" /></a>
-              </td>
-              <td align="right">
-                <a href="http://www.opengroupware.org:80/" target="OGo">
-                  <img rsrc:src="menu_logo_top.gif"
-                       align="center" border="0" alt="" valign="middle" />
-                </a>
-              </td>
-            </tr>
-          </table>
+
+<!--       <tr> -->
+<!--         <td colspan="2"> -->
           <!-- 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="line_left.gif"/></td>
-              <td class="linecolor" width="98%">
-                <img rsrc:src="line_stretch.gif"/>
-              </td>
-              <td class="linecolor"><img rsrc:src="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 cellpadding="0" cellspacing="0" border="0" width="100%"> -->
+<!--             <tr> -->
+<!--               <td class="linecolor"><img rsrc:src="line_left.gif"/></td> -->
+<!--               <td class="linecolor" width="98%"> -->
+<!--                 <img rsrc:src="line_stretch.gif"/> -->
+<!--               </td> -->
+<!--               <td class="linecolor"><img rsrc:src="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> -->
       <tr>
         <td valign="top" width="100%">
           <var:component-content/>
