diff --git a/src/chat_control.py b/src/chat_control.py
index d4598e9ef..87950a23f 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -857,9 +857,9 @@ class ChatControl(ChatControlBase):
 		id = widget.connect('clicked', self.on_actions_button_clicked)
 		self.handlers[id] = widget
 
-		self.hide_chat_buttons_always = gajim.config.get(
+		hide_chat_buttons_always = gajim.config.get(
 			'always_hide_chat_buttons')
-		self.chat_buttons_set_visible(self.hide_chat_buttons_always)
+		self.chat_buttons_set_visible(hide_chat_buttons_always)
 		self.widget_set_visible(self.xml.get_widget('banner_eventbox'),
 			gajim.config.get('hide_chat_banner'))
 		# Initialize drag-n-drop
diff --git a/src/conversation_textview.py b/src/conversation_textview.py
index 6a0004ec2..a12349b3e 100644
--- a/src/conversation_textview.py
+++ b/src/conversation_textview.py
@@ -246,8 +246,6 @@ class ConversationTextview:
 			before_img_iter.backward_char() # one char back (an image also takes one char)
 			buffer.apply_tag_by_name('focus-out-line', before_img_iter, end_iter)
 
-			self.allow_focus_out_line = False
-
 			# update the iter we hold to make comparison the next time
 			self.focus_out_end_iter_offset = buffer.get_end_iter().get_offset()
 
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index d45503707..215d87813 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -180,9 +180,9 @@ class GroupchatControl(ChatControlBase):
 		self.nick = contact.name
 		self.name = self.room_jid.split('@')[0]
 
-		self.hide_chat_buttons_always = gajim.config.get(
+		hide_chat_buttons_always = gajim.config.get(
 			'always_hide_groupchat_buttons')
-		self.chat_buttons_set_visible(self.hide_chat_buttons_always)
+		self.chat_buttons_set_visible(hide_chat_buttons_always)
 		self.widget_set_visible(self.xml.get_widget('banner_eventbox'),
 			gajim.config.get('hide_groupchat_banner'))
 		self.widget_set_visible(self.xml.get_widget('list_scrolledwindow'),
diff --git a/src/message_control.py b/src/message_control.py
index 6404d1726..7a6a934e9 100644
--- a/src/message_control.py
+++ b/src/message_control.py
@@ -37,7 +37,6 @@ class MessageControl:
 		self.display_names = display_names
 		self.contact = contact
 		self.account = account
-		self.hide_chat_buttons_always = False
 		self.hide_chat_buttons_current = False
 		self.resource = resource