diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/handler.py --- a/VirtualMailManager/handler.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/handler.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2007 - 2013, Pascal Volk +# Copyright (c) 2007 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.handler @@ -475,7 +475,8 @@ INVALID_ARGUMENT) dom = self._get_domain(domainname) dominfo = dom.get_info() - if dominfo['domain name'].startswith('xn--'): + if dominfo['domain name'].startswith('xn--') or \ + dominfo['domain name'].count('.xn--'): dominfo['domain name'] += ' (%s)' % \ dominfo['domain name'].encode('utf-8').decode('idna') if details is None: