diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index 7130cb9467..466b0a1f82 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -1135,7 +1135,9 @@ class mail_compose
 		}
 		if ((isset($this->mailPreferences['disableRulerForSignatureSeparation']) &&
 			$this->mailPreferences['disableRulerForSignatureSeparation']) ||
-			empty($signature['ident_signature']) || trim($this->convertHTMLToText($signature['ident_signature'],true,true)) =='')
+			empty($signature['ident_signature']) ||
+			trim($this->convertHTMLToText($signature['ident_signature'],true,true)) =='' ||
+			$this->mailPreferences['insertSignatureAtTopOfMessage'] == '1')
 		{
 			$disableRuler = true;
 		}