diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index f3f3325f25..6d396dc922 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -1199,6 +1199,9 @@ class mail_compose
 		$sel_options['mailaccount'] = $identities = array();
 		foreach(Mail\Account::search(true,false) as $acc_id => $account)
 		{
+			// do NOT add SMTP only accounts as identities
+			if (!$account->is_imap(false)) continue;
+
 			foreach($account->identities($acc_id) as $ident_id => $identity)
 			{
 				$sel_options['mailaccount'][$acc_id.':'.$ident_id] = $identity;