diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index 50ba6ff57b..15933ef8aa 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -2234,7 +2234,7 @@ class mail_compose
 
 					// Try to remove signatures from qouted parts to avoid multiple
 					// signatures problem in reply (rfc3676#section-4.3).
-					if ($hasSignature || ($hasSignature = preg_match("/\G--(\s|\s[\r\n])$/",$value)))
+					if ($_mode != 'forward' && ($hasSignature || ($hasSignature = preg_match("/\G--(\s|\s[\r\n])$/",$value))))
 					{
 						continue;
 					}