diff --git a/ChangeLog b/ChangeLog
index a2ac5c07d..9591f937b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-12-17  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Mailer/SOGoDraftObject.m ([SOGoDraftObject
+	-fetchMailForForwarding:sourceMail]): append the signature to
+	mails forwarded as attachment.
+
 	* UI/MailPartViewers/UIxMailPartViewer.m ([UIxMailPartViewer
 	-clientPart]): new method that returns the corresponding
 	SOGoMailPart instance.
diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index 8a9215627..2e210e011 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -634,6 +634,7 @@ static BOOL        showTextAttachmentsInline  = NO;
 {
   NSDictionary *info, *attachment;
   SOGoUser *currentUser;
+  NSString *signature;
 
   [sourceMail fetchCoreInfos];
   
@@ -659,6 +660,9 @@ static BOOL        showTextAttachmentsInline  = NO;
     {
   // TODO: use subject for filename?
 //   error = [newDraft saveAttachment:content withName:@"forward.mail"];
+      signature = [currentUser signature];
+      if ([signature length])
+	[self setText: [NSString stringWithFormat: @"\n-- \n%@", signature]];
       attachment = [NSDictionary dictionaryWithObjectsAndKeys:
 				   [sourceMail filenameForForward], @"filename",
 				 @"message/rfc822", @"mimetype",
@@ -666,6 +670,7 @@ static BOOL        showTextAttachmentsInline  = NO;
       [self saveAttachment: [sourceMail content]
 	    withMetadata: attachment];
     }
+
   [self storeInfo];
 }