diff --git a/ChangeLog b/ChangeLog
index 45ee2293e..20e432708 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-10-25  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Mailer/SOGoMailObject+Draft.m ([SOGoMailObject
+	-fetchFileAttachmentKeys]): fetch the attachment encoding as well.
+
 	* SoObjects/Mailer/SOGoMailObject.m ([SOGoMailObject
 	-stringForData:_datapartInfo:_info]): simplified by invoking
 	-bodyDataFromEncoding: from our new NSData category methods.
diff --git a/SoObjects/Mailer/SOGoMailObject+Draft.m b/SoObjects/Mailer/SOGoMailObject+Draft.m
index 18e6e0f2f..ebe7e04a7 100644
--- a/SoObjects/Mailer/SOGoMailObject+Draft.m
+++ b/SoObjects/Mailer/SOGoMailObject+Draft.m
@@ -232,20 +232,22 @@
 		       intoArray: (NSMutableArray *) keys
 		        withPath: (NSString *) path
 {
-  NSDictionary *parameters, *currentFile;
+  NSDictionary *disposition, *currentFile;
   NSString *filename, *mimeType;
 
-  parameters = [[part objectForKey: @"disposition"]
-		 objectForKey: @"parameterList"];
-  if (parameters)
+  disposition = [part objectForKey: @"disposition"];
+  filename = [[disposition objectForKey: @"parameterList"]
+	       objectForKey: @"filename"];
+  if (filename)
     {
-      filename = [parameters objectForKey: @"filename"];
       mimeType = [NSString stringWithFormat: @"%@/%@",
 			   [part objectForKey: @"type"],
 			   [part objectForKey: @"subtype"]];
       currentFile = [NSDictionary dictionaryWithObjectsAndKeys:
 				    filename, @"filename",
 				  [mimeType lowercaseString], @"mimetype",
+				  [part
+				    objectForKey: @"encoding"], @"encoding",
 				  path, @"path", nil];
       [keys addObject: currentFile];
     }