diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index 4dbdac2db..b10256dcb 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -701,6 +701,7 @@ class ConnectionVcard:
 
         elif self.awaiting_answers[id_][0] == ARCHIVING_COLLECTIONS_ARRIVED:
             # TODO
+            print 'ARCHIVING_COLLECTIONS_ARRIVED'
             pass
 
         elif self.awaiting_answers[id_][0] == ARCHIVING_COLLECTION_ARRIVED:
diff --git a/src/common/message_archiving.py b/src/common/message_archiving.py
index 56b60aa68..a9b46f039 100644
--- a/src/common/message_archiving.py
+++ b/src/common/message_archiving.py
@@ -184,6 +184,8 @@ class ConnectionArchive:
                 self.dispatch('ARCHIVING_CHANGED', ('itemremove',
                         item.getAttr('jid')))
 
+        raise common.xmpp.NodeProcessed
+
     def request_collections_list_page(self, with_='', start=None, end=None,
     after=None, max=30, exact_match=False):
         iq_ = common.xmpp.Iq('get')
diff --git a/src/common/stanza_session.py b/src/common/stanza_session.py
index 36435d314..1978f55f3 100644
--- a/src/common/stanza_session.py
+++ b/src/common/stanza_session.py
@@ -315,7 +315,8 @@ class EncryptedStanzaSession(ArchivingStanzaSession):
     """
 
     def __init__(self, conn, jid, thread_id, type_='chat'):
-        StanzaSession.__init__(self, conn, jid, thread_id, type_='chat')
+        ArchivingStanzaSession.__init__(self, conn, jid, thread_id,
+            type_='chat')
 
         self.xes = {}
         self.es = {}
diff --git a/src/dialogs.py b/src/dialogs.py
index add937ead..2fff8c743 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -3394,7 +3394,6 @@ class ItemArchivingPreferencesWindow:
             self.item_config = gajim.connections[self.account].items[self.item]
         else:
             self.item_config = gajim.connections[self.account].default
-        print self.item, self.item_config
         self.waiting = None
 
         # Connect to gtk builder
@@ -3620,7 +3619,6 @@ class ArchivingPreferencesWindow:
 
     def on_edit_item_button_clicked(self, widget):
         if not self.current_item:
-            print 'there is no current item'
             return
 
         key_name = 'edit_item_archiving_preferences_%s' % self.current_item
@@ -3726,8 +3724,7 @@ class ArchivingPreferencesWindow:
         print error
 
     def on_close_button_clicked(self, widget):
-        if not self.waiting:
-            self.window.destroy()
+        self.window.destroy()
 
     def on_archiving_preferences_window_destroy(self, widget):
         if 'archiving_preferences' in gajim.interface.instances[self.account]:
diff --git a/src/message_control.py b/src/message_control.py
index f9470e57d..cda55c228 100644
--- a/src/message_control.py
+++ b/src/message_control.py
@@ -207,9 +207,9 @@ class MessageControl:
                 EncryptedStanzaSession) and oldsession.enable_encryption)
 
         archiving_changed = bool(session and isinstance(session,
-                ArchivingStanzaSession) and session.archiving) != \
-                bool(oldsession and isinstance(oldsession,
-                ArchivingStanzaSession) and oldsession.archiving)
+            ArchivingStanzaSession) and session.archiving) != \
+            bool(oldsession and isinstance(oldsession,
+            ArchivingStanzaSession) and oldsession.archiving)
 
         if crypto_changed or archiving_changed:
             self.print_session_details()