diff --git a/ChangeLog b/ChangeLog
index b8ce035d4..15a5fba56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-11-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Mailer/SOGoMailObject+Draft.m ([SOGoMailObject
+	-contentForEditing]): make sure the htmlContent flag is set to NO
+	when we select the textual part. Also we select only the relevant
+	keys for fetching.
+
 	* UI/MailerUI/WOContext+UIxMailer.m ([-mailSubjectFormatter]):
 	removed method.
 
diff --git a/SoObjects/Mailer/SOGoMailObject+Draft.m b/SoObjects/Mailer/SOGoMailObject+Draft.m
index 28b31f558..3b406d1b6 100644
--- a/SoObjects/Mailer/SOGoMailObject+Draft.m
+++ b/SoObjects/Mailer/SOGoMailObject+Draft.m
@@ -75,7 +75,7 @@
 {
   NSArray *types;
   NSDictionary *parts;
-  NSString *rawPart, *content;
+  NSString *rawPart, *content, *contentKey;
   int index;
   BOOL htmlContent;
 
@@ -88,11 +88,15 @@
 	  index = [types indexOfObject: @"text/html"];
 	  htmlContent = YES;
 	}
+      else
+	htmlContent = NO;
       if (index == NSNotFound)
 	content = @"";
       else
 	{
-	  parts = [self fetchPlainTextStrings: keys];
+	  contentKey = [keys objectAtIndex: index];
+	  parts = [self fetchPlainTextStrings:
+			  [NSArray arrayWithObject: contentKey]];
 	  rawPart = [[parts allValues] objectAtIndex: 0];
 	  if (htmlContent)
 	    content = [rawPart htmlToText];