diff --git a/emailadmin/inc/class.emailadmin_imapbase.inc.php b/emailadmin/inc/class.emailadmin_imapbase.inc.php
index 91747cc416..564f48f824 100644
--- a/emailadmin/inc/class.emailadmin_imapbase.inc.php
+++ b/emailadmin/inc/class.emailadmin_imapbase.inc.php
@@ -772,10 +772,11 @@ class emailadmin_imapbase
 	static function generateIdentityString($identity, $fullString=true)
 	{
 		//error_log(__METHOD__.' ('.__LINE__.') '.array2string($identity));
-		if (is_null(self::$mailConfig)) self::$mailConfig = config::read('mail');
+		//if (is_null(self::$mailConfig)) self::$mailConfig = config::read('mail');
 		// not set? -> use default, means full display of all available data
-		if (!isset(self::$mailConfig['how2displayIdentities'])) self::$mailConfig['how2displayIdentities']='';
-		switch (self::$mailConfig['how2displayIdentities'])
+		//if (!isset(self::$mailConfig['how2displayIdentities'])) self::$mailConfig['how2displayIdentities']='';
+		$how2displayIdentities = '';
+		switch ($how2displayIdentities)
 		{
 			case 'email';
 				//$retData = str_replace('@',' ',$identity->emailAddress).($fullString===true?' <'.$identity->emailAddress.'>':'');
diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index 722f25bee8..9eec57917b 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -2205,9 +2205,10 @@ class mail_compose
 		if($_formData['disposition']=='on') {
 			$_mailObject->addHeader('Disposition-Notification-To', $_identity['ident_email']);
 		}
-		if(!empty($_identity->organization) && (mail_bo::$mailConfig['how2displayIdentities'] == '' || mail_bo::$mailConfig['how2displayIdentities'] == 'orgNemail')) {
-			$_mailObject->addHeader('Organization', $_identity['ident_org']);
-		}
+		//error_log(__METHOD__.__LINE__.' Organization:'.array2string($_identity));
+		//if(!empty($_identity['ident_org'])) {
+		//	$_mailObject->addHeader('Organization', $_identity['ident_org']);
+		//}
 
 		// Expand any mailing lists
 		foreach(array('to', 'cc', 'bcc', 'replyto')  as $field)
diff --git a/mail/templates/default/config.tpl b/mail/templates/default/config.tpl
index cbb5db6e85..69e256b072 100755
--- a/mail/templates/default/config.tpl
+++ b/mail/templates/default/config.tpl
@@ -10,23 +10,6 @@
    </tr>
 <!-- END header -->
 <!-- BEGIN body -->
-   <tr class="th">
-    <td colspan="2"><b>{lang_General}</b></td>
-   </tr>
-   <tr class="row_on">
-    <td>
-	 <b>{lang_display_of_identities}</b><br/>
-	 {lang_how_should_the_available_information_on_identities_be_displayed}
-	</td>
-    <td>
-	 <select name="newsettings[how2displayIdentities]">
-      <option value=""{selected_how2displayIdentities_full}>{lang_all_available_info}</option>
-      <option value="email"{selected_how2displayIdentities_email}>{lang_emailaddress}</option>
-      <option value="nameNemail"{selected_how2displayIdentities_nameNemail}>{lang_name} &amp; {lang_emailaddress}</option>
-      <option value="orgNemail"{selected_how2displayIdentities_orgNemail}>{lang_organisation} &amp; {lang_emailaddress}</option>
-     </select>
-	</td>
-   </tr>
    <tr class="th">
 	   <td colspan="2"><b>{lang_Deny_certain_groups_access_to_following_features}</b></td>
    </tr>