diff --git a/ChangeLog b/ChangeLog
index 295ff5d18..1c5b7c908 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2007-10-17  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/SOGoUI/SOGoACLAdvisory.m ([SOGoACLAdvisory -subject]): 
+	returns the subject as quoted-printable.
+
+	* UI/SOGoUI/SOGoACLAdvisory.[hm]: added to intermediary classes:
+	SOGoACLAdditionAdvisory and SOGoACLRemovalAdvisory implementing
+	the "aclMethod" method for the subsequent language-dependent
+	subclasses.
+
+	* UI/SOGoUI/SOGoFolderAdvisory.m ([SOGoFolderAdvisory -subject]):
+	returns the subject as quoted-printable.
+
 	* UI/Scheduler/UIxAppointmentEditor.m ([UIxAppointmentEditor
 	-dealloc]): release item, aptStartDate and aptEndDate.
 
diff --git a/UI/SOGoUI/SOGoACLAdvisory.h b/UI/SOGoUI/SOGoACLAdvisory.h
index c6ac9b664..762b89a1d 100644
--- a/UI/SOGoUI/SOGoACLAdvisory.h
+++ b/UI/SOGoUI/SOGoACLAdvisory.h
@@ -47,22 +47,34 @@
 
 @end
 
-@interface SOGoACLEnglishAdditionAdvisory : SOGoACLAdvisory
+@interface SOGoACLAdditionAdvisory : SOGoACLAdvisory
+
+- (NSString *) aclMethod;
+
 @end
 
-@interface SOGoACLEnglishRemovalAdvisory : SOGoACLAdvisory
+@interface SOGoACLRemovalAdvisory : SOGoACLAdvisory
+
+- (NSString *) aclMethod;
+
 @end
 
-@interface SOGoACLFrenchAdditionAdvisory : SOGoACLAdvisory
+@interface SOGoACLEnglishAdditionAdvisory : SOGoACLAdditionAdvisory
 @end
 
-@interface SOGoACLFrenchRemovalAdvisory : SOGoACLAdvisory
+@interface SOGoACLFrenchAdditionAdvisory : SOGoACLAdditionAdvisory
 @end
 
-@interface SOGoACLGermanAdditionAdvisory : SOGoACLAdvisory
+@interface SOGoACLGermanAdditionAdvisory : SOGoACLAdditionAdvisory
 @end
 
-@interface SOGoACLGermanRemovalAdvisory : SOGoACLAdvisory
+@interface SOGoACLEnglishRemovalAdvisory : SOGoACLRemovalAdvisory
+@end
+
+@interface SOGoACLFrenchRemovalAdvisory : SOGoACLRemovalAdvisory
+@end
+
+@interface SOGoACLGermanRemovalAdvisory : SOGoACLRemovalAdvisory
 @end
 
 #endif /* SOGOACLADVISORY_H */
diff --git a/UI/SOGoUI/SOGoACLAdvisory.m b/UI/SOGoUI/SOGoACLAdvisory.m
index 327b40268..b52ebcc19 100644
--- a/UI/SOGoUI/SOGoACLAdvisory.m
+++ b/UI/SOGoUI/SOGoACLAdvisory.m
@@ -31,6 +31,7 @@
 #import <SoObjects/SOGo/SOGoObject.h>
 #import <SoObjects/SOGo/LDAPUserManager.h>
 #import <SoObjects/SOGo/NSCalendarDate+SOGo.h>
+#import <SoObjects/SOGo/NSString+Utilities.h>
 
 #import "SOGoACLAdvisory.h"
 
@@ -109,7 +110,7 @@
   subject = [[self generateResponse] contentAsString];
   isSubject = NO;
 
-  return [subject stringByTrimmingSpaces];
+  return [[subject stringByTrimmingSpaces] asQPSubjectString: @"utf-8"];
 }
 
 - (NSString *) body
@@ -210,26 +211,32 @@
 
 @end
 
-@implementation SOGoACLEnglishAdditionAdvisory
+@implementation SOGoACLAdditionAdvisory
+
 - (NSString *) aclMethod { return @"add"; }
+
 @end
 
-@implementation SOGoACLEnglishRemovalAdvisory
+@implementation SOGoACLRemovalAdvisory
+
 - (NSString *) aclMethod { return @"remove"; }
+
+@end
+
+@implementation SOGoACLEnglishAdditionAdvisory
 @end
 
 @implementation SOGoACLFrenchAdditionAdvisory
-- (NSString *) aclMethod { return @"add"; }
-@end
-
-@implementation SOGoACLFrenchRemovalAdvisory
-- (NSString *) aclMethod { return @"remove"; }
 @end
 
 @implementation SOGoACLGermanAdditionAdvisory
-- (NSString *) aclMethod { return @"add"; }
+@end
+
+@implementation SOGoACLEnglishRemovalAdvisory
+@end
+
+@implementation SOGoACLFrenchRemovalAdvisory
 @end
 
 @implementation SOGoACLGermanRemovalAdvisory
-- (NSString *) aclMethod { return @"remove"; }
 @end