--- a/VirtualMailManager/EmailAddress.py	Tue Sep 01 05:35:06 2009 +0000
+++ b/VirtualMailManager/EmailAddress.py	Wed Sep 02 06:08:53 2009 +0000
@@ -4,13 +4,9 @@
 
 """Virtual Mail Manager's EmailAddress class to handle e-mail addresses."""
 
-from constants.VERSION import *
-
-import re
-
+from __main__ import re, ERR
 from Exceptions import VMMEmailAddressException as VMMEAE
 import VirtualMailManager as VMM
-import constants.ERROR as ERR
 
 RE_LOCALPART = """[^\w!#$%&'\*\+-\.\/=?^_`{\|}~]"""