diff --git a/src/chat_control.py b/src/chat_control.py
index 9cb325359..2700d7a32 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -1348,6 +1348,7 @@ class ChatControl(ChatControlBase):
 	def update_ui(self):
 		# The name banner is drawn here
 		ChatControlBase.update_ui(self)
+		self.update_toolbar()
 
 	def _update_banner_state_image(self):
 		contact = gajim.contacts.get_contact_with_highest_priority(self.account,
diff --git a/src/gajim.py b/src/gajim.py
index 9c2863a84..764812c3a 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -1790,9 +1790,11 @@ class Interface:
 			'%s\nIt may have been tampered with.') % (jid)
 
 		if session.control:
-			session.control.print_conversation_line(details, 'status', '', tim)
+			session.control.print_conversation_line(details,
+				'status', '', tim)
 		else:
-			dialogs.WarningDialog(_('Unable to decrypt message'), details)
+			dialogs.WarningDialog(_('Unable to decrypt message'),
+				details)
 
 		# terminate the session
 		session.terminate_e2e()