diff --git a/ChangeLog b/ChangeLog
index fe9188e68..08cf853ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-07-27  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailForwardAction.m ([UIxMailForwardAction
+	-forwardAction]): adapted to the new saveAttachment:withMetadata:
+	method (see below).
+
 	* UI/MailerUI/UIxMailEditor.m ([UIxMailEditor -saveAction]): added
 	code to save the attached filenames with the filename returned by
 	the web server as well as their mime types.
diff --git a/UI/MailerUI/UIxMailForwardAction.m b/UI/MailerUI/UIxMailForwardAction.m
index 29daff75f..ba59391e4 100644
--- a/UI/MailerUI/UIxMailForwardAction.m
+++ b/UI/MailerUI/UIxMailForwardAction.m
@@ -93,11 +93,17 @@
 		       nil];
   if ((error = [newDraft storeInfo:info]) != nil)
     return error;
-  
+
   /* attach message */
   
   // TODO: use subject for filename?
-  error = [newDraft saveAttachment:content withName:@"forward.mail"];
+//   error = [newDraft saveAttachment:content withName:@"forward.mail"];
+  attachment = [NSDictionary dictionaryWithObjectsAndKeys:
+			       @"forward.mail", @"filename",
+			     @"message/rfc822", @"mime-type",
+			     nil];
+  error = [newDraft saveAttachment: content
+		    withMetadata: attachment];
   if (error != nil)
     return error;