diff --git a/ChangeLog b/ChangeLog
index 9e006f422..73fb3d9fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-03-15  francis  <flachapelle@inverse.ca>
+
+	* UI/MailerUI/UIxMailListActions.m (-getMailAction): removed this
+	method that is no longer used since live-loading.
+	(-getSortedUIDsAction): restored the call to
+	expungeLastMarkedFolder so that the last visited folder is
+	expunged when switching folder.
+
 2011-03-11  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Contacts/SOGoContactFolders.m
diff --git a/UI/MailerUI/UIxMailListActions.m b/UI/MailerUI/UIxMailListActions.m
index e43e3e065..459f0bf74 100644
--- a/UI/MailerUI/UIxMailListActions.m
+++ b/UI/MailerUI/UIxMailListActions.m
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2004-2005 SKYRIX Software AG
-  Copyright (C) 2006-2010 Inverse inc.
+  Copyright (C) 2006-2011 Inverse inc.
 
   This file is part of SOGo
 
@@ -512,28 +512,6 @@
 
 /* actions */
 
-- (id) getMailAction 
-{
-  // TODO: we might want to flush the caches?
-  id client;
-
-  if ((client = [self clientObject]) == nil) {
-    return [NSException exceptionWithHTTPStatus:404 /* Not Found */
-			reason:@"did not find mail folder"];
-  }
-
-  if (![client respondsToSelector:@selector(flushMailCaches) ]) 
-    {
-      return [NSException exceptionWithHTTPStatus: 500 /* Server Error */
-                          reason:
-                            @"invalid client object (does not support flush)"];
-    }
-
-  [client flushMailCaches];
-
-  return [self redirectToLocation:@"view"];
-}
-
 - (NSDictionary *) getUIDsAndHeadersInFolder: (SOGoMailFolder *) mailFolder
 {
   NSArray *uids, *headers;
@@ -569,6 +547,9 @@
   [response setHeader: @"text/plain; charset=utf-8"
 	       forKey: @"content-type"];
   folder = [self clientObject];
+  // TODO: we might want to flush the caches?
+  //[folder flushMailCaches];
+  [folder expungeLastMarkedFolder];
   noHeaders = [request formValueForKey: @"no_headers"];
   if ([noHeaders length])
     data = [self getSortedUIDsInFolder: folder];
@@ -576,7 +557,7 @@
     data = [self getUIDsAndHeadersInFolder: folder];
   
   [response appendContentString: [data jsonRepresentation]];
-  
+
   return response;
 }
 
diff --git a/UI/MailerUI/product.plist b/UI/MailerUI/product.plist
index 45fa5e6f9..89ba0d7a7 100644
--- a/UI/MailerUI/product.plist
+++ b/UI/MailerUI/product.plist
@@ -77,11 +77,6 @@
         };
       };
       methods = {
-        getMail = {
-          protectedBy = "View";
-          actionClass = "UIxMailListActions";
-          actionName  = "getMail";
-        };
         uids = {
           protectedBy = "<public>";
           actionClass = "UIxMailListActions";
@@ -410,27 +405,6 @@
       };
     };
 
-    SOGoDraftsFolder = {
-      slots = {
-        toolbar = {
-          protectedBy = "View";
-          value = ( /* the toolbar groups */
-                   ( /* first group */
-            { link  = "getMail";
-              image = "tb-mail-getmail-flat-24x24.png";
-              cssClass = "tbicon_getmail"; label = "Get Mail"; },
-            {
-              link     = "#"; // "compose"; // target = "_blank";
-              isSafe = NO;
-              onclick  = "return openMessageWindow(null, 'compose');";
-              image = "tb-mail-write-flat-24x24.png";
-              cssClass = "tbicon_compose"; label = "Write"; },
-                     )
-                    );
-        };
-      };
-    };
-
     SOGoDraftObject = {
       slots = {
         toolbar = {