git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1235 d1b88da0-ebda-0310...

diff --git a/ChangeLog b/ChangeLog
index b8ce035d45cc45064ac4cec78ac8b4dc3f71b20a..15a5fba5689da12273515a4e30c524ae23f18bef 100644 (file)
--- 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 28b31f558b401d8cfc619c72cd8836e9aaa4df47..3b406d1b6c89253f618b9a258f541fe9398284d2 100644 (file)
--- 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];