diff --git a/src/common/gajim.py b/src/common/gajim.py
index ed29a5087..8ddeb1a9b 100644
--- a/src/common/gajim.py
+++ b/src/common/gajim.py
@@ -92,14 +92,19 @@ gmail_domains = ['gmail.com', 'googlemail.com']
 transport_type = {} # list the type of transport
 
 last_message_time = {} # list of time of the latest incomming message
-                                                        # {acct1: {jid1: time1, jid2: time2}, }
-encrypted_chats = {} # list of encrypted chats {acct1: [jid1, jid2], ..}
+                       # {acct1: {jid1: time1, jid2: time2}, }
+encrypted_chats = {}   # list of encrypted chats {acct1: [jid1, jid2], ..}
 
 contacts = LegacyContactsAPI()
-gc_connected = {} # tell if we are connected to the room or not {acct: {room_jid: True}}
-gc_passwords = {} # list of the pass required to enter a room {room_jid: password}
-automatic_rooms = {} # list of rooms that must be automaticaly configured and for which we have a list of invities {account: {room_jid: {'invities': []}}}
-new_room_nick = None # if it's != None, use this nick instead of asking for a new nickname when there is a conflict.
+gc_connected = {}    # tell if we are connected to the room or not
+                     # {acct: {room_jid: True}}
+gc_passwords = {}    # list of the pass required to enter a room
+                     # {room_jid: password}
+automatic_rooms = {} # list of rooms that must be automaticaly configured
+                     # and for which we have a list of invities
+                     #{account: {room_jid: {'invities': []}}}
+new_room_nick = None # if it's != None, use this nick instead of asking for
+                     # a new nickname when there is a conflict.
 
 groups = {} # list of groups
 newly_added = {} # list of contacts that has just signed in
@@ -204,7 +209,7 @@ gajim_common_features = [xmpp.NS_BYTESTREAM, xmpp.NS_SI, xmpp.NS_FILE,
         'jabber:iq:gateway', xmpp.NS_LAST, xmpp.NS_PRIVACY, xmpp.NS_PRIVATE,
         xmpp.NS_REGISTER, xmpp.NS_VERSION, xmpp.NS_DATA, xmpp.NS_ENCRYPTED, 'msglog',
         'sslc2s', 'stringprep', xmpp.NS_PING, xmpp.NS_TIME_REVISED, xmpp.NS_SSN,
-        xmpp.NS_MOOD, xmpp.NS_ACTIVITY, xmpp.NS_NICK, xmpp.NS_ROSTERX, xmpp.NS_SECLABEL,
+        xmpp.NS_MOOD, xmpp.NS_ACTIVITY, xmpp.NS_NICK, xmpp.NS_ROSTERX, xmpp.NS_SECLABEL]
         xmpp.NS_HASHES, xmpp.NS_HASHES_MD5, xmpp.NS_HASHES_SHA1,
         xmpp.NS_HASHES_SHA256, xmpp.NS_HASHES_SHA512]