diff --git a/mail/inc/class.mail_activesync.inc.php b/mail/inc/class.mail_activesync.inc.php
index efc705a9a8..bc8ef5ff59 100644
--- a/mail/inc/class.mail_activesync.inc.php
+++ b/mail/inc/class.mail_activesync.inc.php
@@ -811,15 +811,18 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
 		} // end forward
 
 		// add signature!! -----------------------------------------------------------------
-		$bosignatures	= CreateObject('felamimail.felamimail_bosignatures');
 		if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' ActiveMailProfile:'.array2string($activeMailProfile));
-		$defaultSig = $bosignatures->getDefaultSignature();
-		if ($defaultSig === false) $defaultSig = -1;
-		$presetSig = (!empty($activeMailProfile->signature) ? $activeMailProfile->signature : $defaultSig); // thats the default
-		$disableRuler = false;
-
-		$_signature = $bosignatures->getSignature($presetSig);
-		$signature = $_signature->fm_signature;
+		try
+		{
+			$acc = emailadmin_account::read($this->mail->icServer->ImapServerId);
+			//error_log(__METHOD__.__LINE__.array2string($acc));
+			$_signature = emailadmin_account::read_identity($acc['ident_id'],true);
+		}
+		catch (Exception $e)
+		{
+			$_signature=array();
+		}
+		$signature = $_signature['ident_signature'];
 		if ((isset($preferencesArray['disableRulerForSignatureSeparation']) &&
 			$preferencesArray['disableRulerForSignatureSeparation']) ||
 			empty($signature) || trim(translation::convertHTMLToText($signature)) =='')
diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index 1655f691ed..92c5ec88c2 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -2035,7 +2035,7 @@ class mail_compose
 		}
 		$disableRuler = false;
 		#if ($realCharset != $this->displayCharset) error_log("Error: bocompose::createMessage found Charset ($realCharset) differs from DisplayCharset (".$this->displayCharset.")");
-		$signature = $_signature[ident_signature];
+		$signature = $_signature['ident_signature'];
 
 		if ((isset($this->preferencesArray['insertSignatureAtTopOfMessage']) && $this->preferencesArray['insertSignatureAtTopOfMessage']))
 		{