diff --git a/SOPE/sope-patchset-r1657.diff b/SOPE/sope-patchset-r1657.diff
index b15d0e882..043e5ff28 100644
--- a/SOPE/sope-patchset-r1657.diff
+++ b/SOPE/sope-patchset-r1657.diff
@@ -969,6 +969,15 @@ Index: sope-mime/NGImap4/NGImap4Connection.m
  #include "imCommon.h"
  
  @implementation NGImap4Connection
+@@ -66,7 +67,7 @@
+     self->creationTime = [[NSDate alloc] init];
+     
+     // TODO: retrieve from IMAP4 instead of using a default
+-    self->separator = imap4Separator;
++    self->separator = [imap4Separator copy];
+   }
+   return self;
+ }
 @@ -321,13 +322,15 @@
      return nil;
    if ([folderName characterAtIndex:0] == '/')
@@ -1671,7 +1680,13 @@ Index: sope-mime/NGImap4/ChangeLog
 ===================================================================
 --- sope-mime/NGImap4/ChangeLog	(revision 1660)
 +++ sope-mime/NGImap4/ChangeLog	(working copy)
-@@ -1,3 +1,39 @@
+@@ -1,3 +1,45 @@
++2009-07-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
++
++	* NGImap4Connection.m (-initWithClient:password:): we need to copy
++	the imap4Separator, otherwise it will be released when the connection
++	is deallocated.
++
 +2009-06-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 +
 +	* NSString+Imap4.m (-stringByEncodingImap4FolderName,