diff --git a/ChangeLog b/ChangeLog
index aaebeac99..b3ed0463c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-11-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Mailer/SOGoDraftObject.m ([SOGoDraftObject
+	-fetchMailForForwarding:sourceMail]): fetch attachments for
+	forwarded messages.
+
 	* UI/MailerUI/UIxMailListView.m ([UIxMailListView
 	-hasMessageAttachment]): initialize hasAttachment with "NO" to
 	avoid false positives.
diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index 77a1f58c4..34ee165c0 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -187,7 +187,7 @@ static BOOL        showTextAttachmentsInline  = NO;
       if (headerValue)
 	[headers setObject: headerValue
 		 forKey: headerKeys[count]];
-      else
+      else if ([headers objectForKey: headerKeys[count]])
 	[headers removeObjectForKey: headerKeys[count]];
     }
 
@@ -569,7 +569,11 @@ static BOOL        showTextAttachmentsInline  = NO;
   /* attach message */
   currentUser = [context activeUser];
   if ([[currentUser messageForwarding] isEqualToString: @"inline"])
-    [self setText: [sourceMail contentForInlineForward]];
+    {
+      [self setText: [sourceMail contentForInlineForward]];
+      [self _fetchAttachments: [sourceMail fetchFileAttachmentKeys]
+	    fromMail: sourceMail];
+    }
   else
     {
   // TODO: use subject for filename?