diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m
index 721e7c384..154c2e4cd 100644
--- a/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SoObjects/Mailer/SOGoMailFolder.m
@@ -20,6 +20,7 @@
   02111-1307, USA.
 */
 
+#import <Foundation/NSAutoreleasePool.h>
 #import <Foundation/NSValue.h>
 #import <Foundation/NSFileHandle.h>
 
@@ -2302,14 +2303,16 @@ static NSComparisonResult _compareFetchResultsByUID (id entry1, id entry2, NSArr
                                    threaded: (BOOL) isThreaded
 {
   EOQualifier *searchQualifier;
+  NSAutoreleasePool *pool;
   NSMutableArray *allTokens;
   NSArray *a, *uids;
   NSDictionary *d;
-  id fetchResults;
+  id fetchResults, sortedResults;
 
   int highestmodseq = 0, i;
 
   allTokens = [NSMutableArray array];
+  pool = [[NSAutoreleasePool alloc] init];
 
   if (![theSyncToken isEqualToString: @"-1"])
     {
@@ -2319,7 +2322,6 @@ static NSComparisonResult _compareFetchResultsByUID (id entry1, id entry2, NSArr
   
   // We first make sure QRESYNC is enabled
   [[self imap4Connection] enableExtensions: [NSArray arrayWithObject: @"QRESYNC"]];
-   
 
   // We fetch new messages and modified messages
   if (highestmodseq)
@@ -2367,25 +2369,26 @@ static NSComparisonResult _compareFetchResultsByUID (id entry1, id entry2, NSArr
     {
       /* NOTE: we sort items manually because Cyrus does not properly sort
          entries with a MODSEQ of 0 */
-      fetchResults = [fetchResults sortedArrayUsingFunction: _compareFetchResultsByMODSEQ
+      sortedResults = [fetchResults sortedArrayUsingFunction: _compareFetchResultsByMODSEQ
                                                     context: NULL];
     }
   else
     {
-      fetchResults = [fetchResults sortedArrayUsingFunction: (int(*)(id, id, void*))_compareFetchResultsByUID
+      sortedResults = [fetchResults sortedArrayUsingFunction: (int(*)(id, id, void*))_compareFetchResultsByUID
                                                     context: uids];
     }
 
-  for (i = 0; i < [fetchResults count]; i++)
-    { 
-      if ([[[fetchResults objectAtIndex: i] objectForKey: @"flags"] containsObject: @"deleted"] && initialLoadInProgress)
+  for (i = 0; i < [sortedResults count]; i++)
+    {
+      if ([[[sortedResults objectAtIndex: i] objectForKey: @"flags"] containsObject: @"deleted"] && initialLoadInProgress)
         continue;
 
-      d = [NSDictionary dictionaryWithObject: ([[[fetchResults objectAtIndex: i] objectForKey: @"flags"] containsObject: @"deleted"]) ? [NSNull null] : [[fetchResults objectAtIndex: i] objectForKey: @"modseq"]
-                                      forKey: [[[fetchResults objectAtIndex: i] objectForKey: @"uid"] stringValue]];
+      d = [NSDictionary dictionaryWithObject: ([[[sortedResults objectAtIndex: i] objectForKey: @"flags"] containsObject: @"deleted"]) ? [NSNull null] : [[sortedResults objectAtIndex: i] objectForKey: @"modseq"]
+                                      forKey: [[[sortedResults objectAtIndex: i] objectForKey: @"uid"] stringValue]];
       [allTokens addObject: d];
     }
   
+  [pool release];
 
   // We fetch deleted ones
   if (highestmodseq == 0)
diff --git a/UI/MailerUI/UIxMailListActions.m b/UI/MailerUI/UIxMailListActions.m
index 0779fd922..6a9e766c4 100644
--- a/UI/MailerUI/UIxMailListActions.m
+++ b/UI/MailerUI/UIxMailListActions.m
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2006-2015 Inverse inc.
+  Copyright (C) 2006-2021 Inverse inc.
 
   This file is part of SOGo
 
@@ -26,6 +26,7 @@
   object.
 */
 
+#import <Foundation/NSAutoreleasePool.h>
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSCharacterSet.h>
 #import <Foundation/NSTimeZone.h>
@@ -867,6 +868,7 @@
 		       inFolder: (SOGoMailFolder *) mailFolder
 {
   UIxEnvelopeAddressFormatter *addressFormatter;
+  NSAutoreleasePool *pool;
   NSMutableArray *headers, *msg, *tags;
   NSEnumerator *msgsList;
   NSArray *to, *from;
@@ -890,6 +892,8 @@
 
       msg = [NSMutableArray arrayWithObjects: @"To", @"hasAttachment", @"isFlagged", @"Subject", @"From", @"isRead", @"Priority", @"RelativeDate", @"Size", @"Flags", @"uid", @"isAnswered", @"isForwarded", nil];
       [headers addObject: msg];
+      count = 0;
+      pool = [[NSAutoreleasePool alloc] init];
       while (message)
         {
           // We must check for "umimportant" untagged responses.
@@ -976,6 +980,13 @@
           [msg addObject: [NSNumber numberWithBool: [self isMessageForwarded]]];
       
           [self setMessage: [msgsList nextObject]];
+
+          count++;
+          if (count % 10 == 0)
+            {
+              [pool release];
+              pool = [[NSAutoreleasePool alloc] init];
+            }
         }
     }