diff --git a/phpgwapi/inc/class.send.inc.php b/phpgwapi/inc/class.send.inc.php
index 3858fec1ff..916ff16776 100644
--- a/phpgwapi/inc/class.send.inc.php
+++ b/phpgwapi/inc/class.send.inc.php
@@ -69,7 +69,21 @@
 						if($ogServer->smtpAuth) {
 							$this->SMTPAuth = true;
 							list($username,$senderadress) = explode(';', $ogServer->username,2);
-							if (isset($senderadress) && !empty($senderadress)) $this->Sender = $senderadress;
+							if (!isset($this->Sender) || empty($this->Sender)) // if there is no Sender info, try to determine one
+							{
+								if (isset($senderadress) && !empty($senderadress)) // thats the senderinfo, that may be part of the 
+								{												   // SMTP Auth. this one has precedence over other settings 
+									$this->Sender = $senderadress;
+								}
+								else // there is no senderinfo with smtp auth, fetch the identities mailaddress, as it should be connected to
+								{    // the active profiles smtp settings
+									$activeMailProfile = $preferences->getIdentity(0); // fetch active identity
+									if (isset($activeMailProfile->emailAddress) && !empty($activeMailProfile->emailAddress)) 
+									{ 
+										$this->Sender = $activeMailProfile->emailAddress;
+									}
+								}
+							} 
 							$this->Username = $username;
 							$this->Password = $ogServer->password;
 						}