diff --git a/ChangeLog b/ChangeLog
index c5d3f4b14..899503d72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-01  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* 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 7a605b2a6..88ba01afc 100644
--- a/SoObjects/Mailer/SOGoSieveConverter.m
+++ b/SoObjects/Mailer/SOGoSieveConverter.m
@@ -25,6 +25,8 @@
 #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>
@@ -458,7 +460,7 @@ static NSDictionary *methodRequirements = nil;
                 {
                   dd = [user domainDefaults];
                   mailbox
-                    = [[argument componentsSeparatedByString: @"/"]
+                    = [[[argument stringByEncodingImap4FolderName] componentsSeparatedByString: @"/"]
                           componentsJoinedByString: [dd imapFolderSeparator]];
                   sieveAction = [NSString stringWithFormat: @"%@ %@",
                                           method, [mailbox asSieveQuotedString]];