diff --git a/gajim/chat_control.py b/gajim/chat_control.py
index 74f84d5430c327eef8e43deb6907b5a1b001564c..f0acdb206c93295e79f2b6860b2043ecc6d7500d 100644
--- a/gajim/chat_control.py
+++ b/gajim/chat_control.py
@@ -199,8 +199,6 @@ def __init__(self, parent_win, contact, acct, session, resource=None):
             session.control = self
             self.session = session
 
-        # Enable encryption if needed
-        self.no_autonegotiation = False
         self.add_actions()
         self.update_ui()
         self.set_lock_image()
diff --git a/gajim/chat_control_base.py b/gajim/chat_control_base.py
index ae25546c275656b9e8c644df03d0c7a524a7417b..f63cb2de504236bbcef63a508860619f8d46de05 100644
--- a/gajim/chat_control_base.py
+++ b/gajim/chat_control_base.py
@@ -838,8 +838,6 @@ def _on_drag_leave(self, *args):
     def _on_drag_motion(self, *args):
         # FIXME: DND on non editable TextView, find a better way
         if not self.drag_entered:
-            # We drag new data over the TextView, make it editable to catch dnd
-            self.drag_entered_conv = True
             self.conv_textview.tv.set_editable(True)
 
     def drag_data_file_transfer(self, contact, selection, _widget):
@@ -1459,7 +1457,6 @@ def got_disconnected(self):
         self.msg_textview.set_editable(False)
         self.conv_textview.tv.grab_focus()
 
-        self.no_autonegotiation = False
         self.update_toolbar()