diff --git a/ChangeLog b/ChangeLog
index bde4bfba5..a90128216 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,9 +7,6 @@
 	* UI/WebServerResources/MailerUI.js (-startDragging): improved
 	behavior of drag and drop.
 
-	* SoObjects/Mailer/SOGoSieveConverter.m (-_extractSieveAction:):
-	now encodes the mailbox name for IMAP.
-
 2011-01-28  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/MailerUI.js (-onDocumentKeydown): set
diff --git a/SoObjects/Mailer/SOGoSieveConverter.m b/SoObjects/Mailer/SOGoSieveConverter.m
index 88ba01afc..7a605b2a6 100644
--- a/SoObjects/Mailer/SOGoSieveConverter.m
+++ b/SoObjects/Mailer/SOGoSieveConverter.m
@@ -25,8 +25,6 @@
 #import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 
-#import <NGImap4/NSString+Imap4.h>
-
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/SOGoDomainDefaults.h>
@@ -460,7 +458,7 @@ static NSDictionary *methodRequirements = nil;
                 {
                   dd = [user domainDefaults];
                   mailbox
-                    = [[[argument stringByEncodingImap4FolderName] componentsSeparatedByString: @"/"]
+                    = [[argument componentsSeparatedByString: @"/"]
                           componentsJoinedByString: [dd imapFolderSeparator]];
                   sieveAction = [NSString stringWithFormat: @"%@ %@",
                                           method, [mailbox asSieveQuotedString]];