--- a/mail.py	Thu Dec 08 14:29:48 2011 +0100
+++ b/mail.py	Fri Dec 09 12:08:44 2011 +0100
@@ -25,11 +25,7 @@
 from email.mime.text import MIMEText
 from email.mime.image import MIMEImage
 from email.header import Header
-try:
-    from socket import gethostname
-except ImportError:
-    def gethostname(): # gae
-        return 'XXX'
+from socket import gethostname
 
 from cubicweb.view import EntityView
 from cubicweb.entity import Entity