diff --git a/ChangeLog b/ChangeLog
index ec4d8026f..f64b2b057 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-07-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Mailer/SOGoMailObject.m ([SOGoMailObject
+	-contentAsString]): returns the message encoded in ISO Latin 1
+	again.
+
 	* SoObjects/SOGo/SOGoUser.m ([SOGoUser +initialize]): read the
 	SOGoSuperUsername user defaults.
 	([SOGoUser -initWithLogin:newLoginroles:newRoles]): simplified
diff --git a/SoObjects/Mailer/SOGoMailObject.m b/SoObjects/Mailer/SOGoMailObject.m
index a8b76bdb2..29c6a0ea7 100644
--- a/SoObjects/Mailer/SOGoMailObject.m
+++ b/SoObjects/Mailer/SOGoMailObject.m
@@ -435,9 +435,8 @@ static BOOL debugSoParts       = NO;
   if ([content isKindOfClass:[NSException class]])
     return (id)content;
   
-#warning the encoding here might be wrong...
-  s = [[NSString alloc] initWithData: content 
-			encoding: NSUTF8StringEncoding];
+  s = [[NSString alloc] initWithData: content
+			encoding: NSISOLatin1StringEncoding];
   if (s == nil) {
     [self logWithFormat:
 	    @"ERROR: could not convert data of length %d to string",