diff --git a/ChangeLog b/ChangeLog
index 01566a18a..bb9b8fbc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2007-05-23  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailSplashView.m: removed.
+
 	* SoObjects/Appointments/SOGoCalendarComponent.m
 	([SOGoCalendarComponent -getUIDsForICalPersons:iCalPersons]): add
 	the uid to the list only when the user email is recognized by the
diff --git a/UI/MailerUI/UIxMailSplashView.m b/UI/MailerUI/UIxMailSplashView.m
deleted file mode 100644
index 628011889..000000000
--- a/UI/MailerUI/UIxMailSplashView.m
+++ /dev/null
@@ -1,29 +0,0 @@
-/* UIxMailSplashView - 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.
- */
-
-#import <SOGoUI/UIxComponent.h>
-
-@interface UIxMailSplashView : UIxComponent
-@end
-
-@implementation UIxMailSplashView
-@end /* UIxMailSplashView */
diff --git a/UI/MailerUI/product.plist b/UI/MailerUI/product.plist
index ea820f5b6..1f44d4698 100644
--- a/UI/MailerUI/product.plist
+++ b/UI/MailerUI/product.plist
@@ -260,24 +260,16 @@
         };
       };
       methods = {
-        view = {
-          protectedBy = "View";
-          pageName    = "UIxMailAccountView";
-        };
-        getMail = {
-          protectedBy = "View";
-          pageName    = "UIxMailAccountView";
-        };
         compose = {
           protectedBy = "View";
           actionClass = "UIxMailEditorAction";
           actionName  = "compose";
         };
-        createFolder = {
-          protectedBy = "View";
-          pageName    = "UIxMailAccountView";
-          actionName  = "createFolder";
-        };
+	mailboxes = {
+	   protectedBy = "View";
+	   pageName = "UIxMailAccountView";
+	   actionName = "listMailboxes";
+	};
       };
     };
 
diff --git a/UI/Templates/MailerUI/UIxMailAccountView.wox b/UI/Templates/MailerUI/UIxMailAccountView.wox
deleted file mode 100644
index 26cef689e..000000000
--- a/UI/Templates/MailerUI/UIxMailAccountView.wox
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.0' standalone='yes'?>
-  <div style="padding: 1em;"
-    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:rsrc="OGo:url"
-    xmlns:label="OGo:label">
-    <h2>
-      SOGo Mail - <var:string value="objectTitle" />
-      
-      <var:if condition="clientObject.isSharedAccount">
-        <var:string label:value="Shared Account: " />
-      </var:if>
-      
-    </h2>
-    <var:if condition="clientObject.isSharedAccount">
-      <div>
-        <var:string label:value="Share: " />
-        <var:string value="clientObject.sharedAccountName" />
-      </div>
-    </var:if>
-    
-    <h3>Email</h3>
-    <p>
-      <a href="INBOX/" onclick="initMailboxSelection(currentMailbox + '/INBOX'); openMailbox(currentMailbox + '/INBOX'); return false;"><img rsrc:src="read-messages.png" /><var:string label:value="Read messages" /></a><br />
-      <a href="#" onclick="clickedCompose(this);"><img rsrc:src="write-message.png" /><var:string label:value="Write a new message" /></a><br />
-    </p>
-
-    <h3>Accounts</h3>
-    <p>
-      <a href=""><img rsrc:src="account-settings.png" />View settings for this account</a><br />
-      <a href=""><img rsrc:src="create-account.png" />Create a new account</a> [TBD: not in Agenor]<br />
-    </p>
-    
-    <h3>Advanced Features</h3>
-    <p>
-      <a href=""><img rsrc:src="search-messages.png" />Search messages</a><br />
-      <a href=""><img rsrc:src="manage-filters.png" />Manage message filters</a><br />
-      <a href=""><img rsrc:src="manage-imap.png" />Manage folder subscriptions</a><br />
-      <a href=""><img rsrc:src="offline-settings.png" />Offline settings</a> [TBD: not in Agenor]<br />
-    </p>
-  </div>
diff --git a/UI/Templates/MailerUI/UIxMailSplashView.wox b/UI/Templates/MailerUI/UIxMailSplashView.wox
deleted file mode 100644
index 26cef689e..000000000
--- a/UI/Templates/MailerUI/UIxMailSplashView.wox
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.0' standalone='yes'?>
-  <div style="padding: 1em;"
-    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:rsrc="OGo:url"
-    xmlns:label="OGo:label">
-    <h2>
-      SOGo Mail - <var:string value="objectTitle" />
-      
-      <var:if condition="clientObject.isSharedAccount">
-        <var:string label:value="Shared Account: " />
-      </var:if>
-      
-    </h2>
-    <var:if condition="clientObject.isSharedAccount">
-      <div>
-        <var:string label:value="Share: " />
-        <var:string value="clientObject.sharedAccountName" />
-      </div>
-    </var:if>
-    
-    <h3>Email</h3>
-    <p>
-      <a href="INBOX/" onclick="initMailboxSelection(currentMailbox + '/INBOX'); openMailbox(currentMailbox + '/INBOX'); return false;"><img rsrc:src="read-messages.png" /><var:string label:value="Read messages" /></a><br />
-      <a href="#" onclick="clickedCompose(this);"><img rsrc:src="write-message.png" /><var:string label:value="Write a new message" /></a><br />
-    </p>
-
-    <h3>Accounts</h3>
-    <p>
-      <a href=""><img rsrc:src="account-settings.png" />View settings for this account</a><br />
-      <a href=""><img rsrc:src="create-account.png" />Create a new account</a> [TBD: not in Agenor]<br />
-    </p>
-    
-    <h3>Advanced Features</h3>
-    <p>
-      <a href=""><img rsrc:src="search-messages.png" />Search messages</a><br />
-      <a href=""><img rsrc:src="manage-filters.png" />Manage message filters</a><br />
-      <a href=""><img rsrc:src="manage-imap.png" />Manage folder subscriptions</a><br />
-      <a href=""><img rsrc:src="offline-settings.png" />Offline settings</a> [TBD: not in Agenor]<br />
-    </p>
-  </div>