diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index 666b07ccde..4d7965d916 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -309,7 +309,7 @@ class mail_compose
 						$sendOK=false;
 						$message = $this->errorInfo;
 					}
-					if (!empty($_content['signatureid']))
+					if (!empty($_content['signatureid']) && $_content['signatureid'] != $sigPref[$this->mail_bo->profileID])
 					{
 						$sigPref[$this->mail_bo->profileID]=$_content['signatureid'];
 						$GLOBALS['egw']->preferences->add('mail','LastSignatureIDUsed',$sigPref,'user');