diff --git a/ChangeLog b/ChangeLog
index 7048ec139..d5e1c4576 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-03-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailFolderActions.m (-copyMessagesAction)
+	(-expungeAction, -emptyTrashAction): use "-mailAccountFolder" in
+	order to retrieve the account folder as the clientObject may
+	actually be a nested folder...
+
 	* UI/WebServerResources/UIxTaskEditor.js (initializeStatusLine):
 	bind onStatusListChange as callback to "change" rather than
 	"mouseup" as it otherwise fails to be invoked on Chrome.
diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m
index 234623ebd..3858d98e3 100644
--- a/UI/MailerUI/UIxMailFolderActions.m
+++ b/UI/MailerUI/UIxMailFolderActions.m
@@ -314,7 +314,7 @@
     if (!response)
       {
 	// We return the inbox quota
-	account = [co container];
+	account = [co mailAccountFolder];
 	data = [NSDictionary dictionaryWithObjectsAndKeys: [account getInboxQuota], @"quotas", nil];
 	response = [self responseWithStatus: 200
 				  andString: [data jsonRepresentation]];
@@ -492,7 +492,7 @@
       [co flushMailCaches];
 
       // We return the inbox quota
-      account = [co container];
+      account = [co mailAccountFolder];
       data = [NSDictionary dictionaryWithObjectsAndKeys: [account getInboxQuota], @"quotas", nil];
       response = [self responseWithStatus: 200
 				andString: [data jsonRepresentation]];
@@ -533,7 +533,7 @@
   else
     {
       // We return the inbox quota
-      account = [co container];
+      account = [co mailAccountFolder];
       data = [NSDictionary dictionaryWithObjectsAndKeys: [account getInboxQuota], @"quotas", nil];
       response = [self responseWithStatus: 200
 				andString: [data jsonRepresentation]];