diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 4381aa81..dbdd93d7 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -10,6 +10,11 @@
 # Last update:
 # $Id$
 
+changes since the 2.3.5 release (postfixadmin-2.3 branch)
+----------------------------------------------------------------
+
+  - display domain and mailbox description with correct encoding
+
 Version 2.3.5 - 2012/01/16 - SVN r1335 (postfixadmin-2.3 branch)
 ----------------------------------------------------------------
 
diff --git a/templates/admin_list-domain.php b/templates/admin_list-domain.php
index eb1bcdc3..59ac1292 100644
--- a/templates/admin_list-domain.php
+++ b/templates/admin_list-domain.php
@@ -50,7 +50,7 @@ if (sizeof ($domain_properties) > 0)
       {
          print "   <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
          print "<td><a href=\"list-virtual.php?domain=" . $domain_properties[$i]['domain'] . "\">" . $domain_properties[$i]['domain'] . "</a></td>";
-         print "<td>" . htmlentities($domain_properties[$i]['description']) . "</td>";
+         print "<td>" . htmlentities($domain_properties[$i]['description'], ENT_QUOTES, 'UTF-8') . "</td>";
          print "<td>" . $domain_properties[$i]['alias_count'] . " / " . $domain_properties[$i]['aliases'] . "</td>";
          print "<td>" . $domain_properties[$i]['mailbox_count'] . " / " . $domain_properties[$i]['mailboxes'] . "</td>";
          if ($CONF['quota'] == 'YES')
diff --git a/templates/list-virtual.php b/templates/list-virtual.php
index 020a0f39..1d6cb35b 100644
--- a/templates/list-virtual.php
+++ b/templates/list-virtual.php
@@ -314,7 +314,7 @@ if (sizeof ($tMailbox) > 0) {
          }
 
 
-         print "      <td>" . htmlentities($tMailbox[$i]['name']) . "</td>\n";
+         print "      <td>" . htmlentities($tMailbox[$i]['name'], ENT_QUOTES, 'UTF-8') . "</td>\n";
          if ($CONF['quota'] == 'YES')
          {
             print "      <td>";