diff --git a/src/common/helpers.py b/src/common/helpers.py
index fff0dde052eca154c60a2374fc008593049d7873..66a0e87f369372fcaef690e67fc4889fe6f1db77 100644
--- a/src/common/helpers.py
+++ b/src/common/helpers.py
@@ -44,7 +44,6 @@ from encodings.punycode import punycode_encode
 
 from i18n import Q_
 from i18n import ngettext
-import xmpp
 
 try:
 	import winsound # windows-only built-in module for playing wav
@@ -1347,6 +1346,7 @@ def prepare_and_validate_gpg_keyID(account, jid, keyID):
 	return keyID
 
 def update_optional_features(account = None):
+	import xmpp
 	if account:
 		accounts = [account]
 	else: