diff --git a/src/common/connection.py b/src/common/connection.py
index 29cd7b254..b482facfb 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -2009,14 +2009,13 @@ class Connection(CommonConnection, ConnectionHandlers):
                         # Remove stored bookmarks accessible to everyone.
                         self.send_pb_purge(our_jid, 'storage:bookmarks')
                         self.send_pb_delete(our_jid, 'storage:bookmarks')
-                if (nbxmpp.NS_MAM or nbxmpp.NS_MAM_1 or nbxmpp.NS_MAM_2) \
-                        in obj.features:
-                    if nbxmpp.NS_MAM_2 in obj.features:
-                        self.archiving_namespace = nbxmpp.NS_MAM_2
-                    elif nbxmpp.NS_MAM_1 in obj.features:
-                        self.archiving_namespace = nbxmpp.NS_MAM_1
-                    else:
-                        self.archiving_namespace = nbxmpp.NS_MAM
+                if nbxmpp.NS_MAM_2 in obj.features:
+                    self.archiving_namespace = nbxmpp.NS_MAM_2
+                elif nbxmpp.NS_MAM_1 in obj.features:
+                    self.archiving_namespace = nbxmpp.NS_MAM_1
+                elif nbxmpp.NS_MAM in obj.features:
+                    self.archiving_namespace = nbxmpp.NS_MAM
+                if self.archiving_namespace:
                     self.archiving_supported = True
                     self.archiving_313_supported = True
                     get_action(self.name + '-archive').set_enabled(True)