diff --git a/gajim/chat_control.py b/gajim/chat_control.py
index 34b800dc455f3a9adf8a1513a04201f5cc5d4b95..a2d8e13e9de419d997e903a03280b0d75a22d162 100644
--- a/gajim/chat_control.py
+++ b/gajim/chat_control.py
@@ -48,7 +48,6 @@
 from gajim.common.helpers import open_uri
 from gajim.common.helpers import geo_provider_from_location
 from gajim.common.helpers import open_file
-from gajim.common.contacts import GC_Contact
 from gajim.common.const import AvatarSize
 from gajim.common.const import KindConstant
 from gajim.common.const import PEPEventType
@@ -1191,7 +1190,6 @@ def _on_client_state_changed(self, _client, _signal_name, state):
         self.msg_textview.set_sensitive(state.is_connected)
         self.msg_textview.set_editable(state.is_connected)
 
-        print(state)
         self._update_avatar()
         self.update_toolbar()
         self.draw_banner()
diff --git a/gajim/gtk/conversation/code_widget.py b/gajim/gtk/conversation/code_widget.py
index d347543fefac5be4306af5df45ef0005b67772cd..1579e7310e2a67d0038a008b8c92012831deafb1 100644
--- a/gajim/gtk/conversation/code_widget.py
+++ b/gajim/gtk/conversation/code_widget.py
@@ -50,7 +50,7 @@ def __init__(self, account):
         self._textview = CodeTextview()
         self._scrolled = Gtk.ScrolledWindow()
         self._scrolled.set_policy(Gtk.PolicyType.AUTOMATIC,
-                                  Gtk.PolicyType.AUTOMATIC)
+                                  Gtk.PolicyType.NEVER)
         self._scrolled.set_hexpand(True)
         self._scrolled.set_vexpand(True)
         self._scrolled.set_propagate_natural_height(True)