From 002f886ca710cd6425aad3025c7a1687c03373b4 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 19 Mar 2015 13:09:40 +0000
Subject: [PATCH] fixed stalled mail compose dialog if name of user contained
 non-ascii characters AND export charset was not utf-8

---
 emailadmin/inc/class.emailadmin_account.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emailadmin/inc/class.emailadmin_account.inc.php b/emailadmin/inc/class.emailadmin_account.inc.php
index 109a2f95e8..0e64378458 100644
--- a/emailadmin/inc/class.emailadmin_account.inc.php
+++ b/emailadmin/inc/class.emailadmin_account.inc.php
@@ -704,7 +704,7 @@ class emailadmin_account implements ArrayAccess
 				$err = null;
 				$value = $merge->merge_string($value,
 					(array)accounts::id2name($account_id, 'person_id'),
-					$err, $name == 'ident_signature' ? 'text/html' : 'text/plain');
+					$err, $name == 'ident_signature' ? 'text/html' : 'text/plain', null, 'utf-8');
 			}
 		}
 		//error_log(__METHOD__."(".array2string($identity).") returning ".array2string($to_replace));