diff --git a/SOPE/sope-patchset-r1626.diff b/SOPE/sope-patchset-r1626.diff
index 0ddf7d01b..ca2fac4a7 100644
--- a/SOPE/sope-patchset-r1626.diff
+++ b/SOPE/sope-patchset-r1626.diff
@@ -441,14 +441,14 @@ Index: sope-mime/NGImap4/NGImap4Client.m
    return [self->normer normalizeSearchResponse:[self processCommand:s]];
  }
  
-@@ -1193,6 +1221,79 @@
+@@ -1193,6 +1221,82 @@
  
  /* Private Methods */
  
 +- (NSDictionary *) _sopeSORT: (id)_sortSpec  qualifier:(EOQualifier *)_qual  encoding:(NSString *)_encoding {
-+  
 +  NSMutableDictionary *result;
 +  NSDictionary *d;
++  NSCalendarDate *envDate;
 +
 +  result = [[[NSMutableDictionary alloc] init] autorelease];
 +  [result setObject: [NSNumber numberWithBool: NO]  forKey: @"result"];
@@ -495,7 +495,10 @@ Index: sope-mime/NGImap4/NGImap4Client.m
 +	    }
 +	  else
 +	    {
-+	      [dict setObject: [env date]  forKey: uid];
++ 	      envDate = [env date];
++ 	      if (!envDate)
++ 		envDate = [NSCalendarDate date];
++	      [dict setObject: envDate forKey: uid];
 +	      b = NO;
 +	    }
 +	}
@@ -1121,7 +1124,13 @@ Index: sope-mime/NGImap4/ChangeLog
 ===================================================================
 --- sope-mime/NGImap4/ChangeLog	(révision 1626)
 +++ sope-mime/NGImap4/ChangeLog	(copie de travail)
-@@ -1,3 +1,23 @@
+@@ -1,3 +1,29 @@
++2008-10-23  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
++
++	* NGImap4Client.m ([NGImap -sort:qualifier:encoding:]): message
++	without date that are sorted on servers which do not have the SORT
++	capability are now given the current date as a work-around.
++
 +2008-09-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 +
 +	* NGImap4Connection.m ([NGImap -doesMailboxExistAtURL:]): restore