diff --git a/src/chat_control.py b/src/chat_control.py
index e63b9c3c4..ef313bab6 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -1102,7 +1102,8 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 
     def on_font_menuitem_activale(self, widget):
         font_dialog = Gtk.FontChooserDialog(None, self.parent_win.window)
-        font_dialog.connect('response', self.msg_textview.font_set)
+        start, finish = self.msg_textview.get_active_iters()
+        font_dialog.connect('response', self.msg_textview.font_set, start, finish)
         font_dialog.show_all()
 
     def on_actions_button_clicked(self, widget):
diff --git a/src/common/stanza_session.py b/src/common/stanza_session.py
index 2cf146b74..2dc4bf151 100644
--- a/src/common/stanza_session.py
+++ b/src/common/stanza_session.py
@@ -45,7 +45,7 @@ if gajim.HAVE_PYCRYPTO:
     from Crypto.PublicKey import RSA
 
     from common import dh
-    from . import secrets
+    import secrets
 
 XmlDsig = 'http://www.w3.org/2000/09/xmldsig#'
 
diff --git a/src/message_textview.py b/src/message_textview.py
index 4fea823b5..9b7b0bb37 100644
--- a/src/message_textview.py
+++ b/src/message_textview.py
@@ -147,7 +147,6 @@ class MessageTextView(Gtk.TextView):
         _buffer.remove_all_tags(start, finish)
 
     def color_set(self, widget, response):
-        print (response)
         if response == -6 or response == -4:
             widget.destroy()
             return
@@ -174,13 +173,11 @@ class MessageTextView(Gtk.TextView):
 
         _buffer.apply_tag_by_name(tag_name, start, finish)
 
-    def font_set(self, widget, response):
+    def font_set(self, widget, response, start, finish):
         if response == -6 or response == -4:
             widget.destroy()
             return
 
-        _buffer = self.get_buffer()
-
         font = widget.get_font()
         font_desc = widget.get_font_desc()
         family = font_desc.get_family()
@@ -191,6 +188,8 @@ class MessageTextView(Gtk.TextView):
 
         widget.destroy()
 
+        _buffer = self.get_buffer()
+
         tag_name = 'font' + font
         if not tag_name in self.fonts_tags:
             tagFont = _buffer.create_tag(tag_name)
@@ -201,8 +200,6 @@ class MessageTextView(Gtk.TextView):
             self.end_tags[tag_name] = '</span>'
             self.fonts_tags.append(tag_name)
 
-        start, finish = self.get_active_iters()
-
         for tag in self.fonts_tags:
             _buffer.remove_tag_by_name(tag, start, finish)