diff --git a/whiteboard/plugin.py b/whiteboard/plugin.py
index 40d458a..fb50902 100644
--- a/whiteboard/plugin.py
+++ b/whiteboard/plugin.py
@@ -27,28 +27,27 @@ Whiteboard plugin.
 :license: GPL
 '''
 
+from gi.repository import Gio
+from gi.repository import GLib
+from nbxmpp import Message
+
 from gajim import common
 from gajim.common import helpers
 from gajim.common import app
+
 from gajim.plugins import GajimPlugin
 from gajim.plugins.gajimplugin import GajimPluginException
 from gajim.plugins.helpers import log_calls, log
-from nbxmpp import Message
-from gi.repository import Gio
-from gi.repository import GLib
+from gajim.plugins.plugins_i18n import _
+
 from gajim import chat_control
 from gajim.common import ged
 from gajim.common.jingle_session import JingleSession
 from gajim.common.jingle_content import JingleContent
 from gajim.common.jingle_transport import JingleTransport, TransportType
-from gajim import dialogs
+from gajim.gtk.dialogs import NonModalConfirmationDialog
 from .whiteboard_widget import Whiteboard, HAS_GOOCANVAS
 
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
 
 NS_JINGLE_XHTML = 'urn:xmpp:tmp:jingle:apps:xhtml'
 NS_JINGLE_SXE = 'urn:xmpp:tmp:jingle:transports:sxe'
@@ -152,7 +151,7 @@ class WhiteboardPlugin(GajimPlugin):
         pritext = _('Incoming Whiteboard')
         sectext = _('%(name)s (%(jid)s) wants to start a whiteboard with '
             'you. Do you want to accept?') % {'name': name, 'jid': jid}
-        dialog = dialogs.NonModalConfirmationDialog(pritext, sectext=sectext,
+        dialog = NonModalConfirmationDialog(pritext, sectext=sectext,
             on_response_ok=on_ok, on_response_cancel=on_cancel)
         dialog.popup()
 
diff --git a/whiteboard/whiteboard_widget.py b/whiteboard/whiteboard_widget.py
index b1f390c..44cb861 100644
--- a/whiteboard/whiteboard_widget.py
+++ b/whiteboard/whiteboard_widget.py
@@ -23,11 +23,10 @@ from gi.repository import Gtk
 
 from gajim.common import app
 
-# Since Gajim 1.1.0 _() has to be imported
-try:
-    from gajim.common.i18n import _
-except ImportError:
-    pass
+from gajim.gtk.filechoosers import NativeFileChooserDialog, Filter
+
+from gajim.plugins.plugins_i18n import _
+
 
 try:
     import gi
@@ -38,55 +37,11 @@ except:
     HAS_GOOCANVAS = False
 
 
-try:
-    from gajim.gtk.filechoosers import NativeFileChooserDialog, Filter
+class SvgSaveDialog(NativeFileChooserDialog):
 
-    NEW_FILECHOOSER = True
-
-    class SvgSaveDialog(NativeFileChooserDialog):
-
-        _title = _('Save File as…')
-        _filters = [Filter(_('All files'), '*', False),
-                    Filter(_('SVG files'), '*.svg', True)]
-
-except ImportError:
-    from gajim.dialogs import FileChooserDialog
-
-    NEW_FILECHOOSER = False
-
-    class SvgChooserDialog(FileChooserDialog):
-        def __init__(self, on_response_ok=None, on_response_cancel=None):
-            '''
-            Choose in which SVG file to store the image
-            '''
-            def on_ok(widget, callback):
-                '''
-                check if file exists and call callback
-                '''
-                path_to_file = self.get_filename()
-                widget.destroy()
-                callback(path_to_file)
-
-            FileChooserDialog.__init__(self,
-                title_text=_('Save Image as...'),
-                action=Gtk.FileChooserAction.SAVE,
-                buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_SAVE,
-                    Gtk.ResponseType.OK),
-                current_folder='',
-                default_response=Gtk.ResponseType.OK,
-                on_response_ok=(on_ok, on_response_ok),
-                on_response_cancel=on_response_cancel)
-
-            filter_ = Gtk.FileFilter()
-            filter_.set_name(_('All files'))
-            filter_.add_pattern('*')
-            self.add_filter(filter_)
-
-            filter_ = Gtk.FileFilter()
-            filter_.set_name(_('SVG Files'))
-            filter_.add_pattern('*.svg')
-            self.add_filter(filter_)
-            self.set_filter(filter_)
+    _title = _('Save File as…')
+    _filters = [Filter(_('All files'), '*', False),
+                Filter(_('SVG files'), '*.svg', True)]
 
 '''
 A whiteboard widget made for Gajim.
@@ -167,11 +122,8 @@ class Whiteboard(object):
         self.image.clear_canvas()
 
     def on_export_button_clicked(self, widget):
-        if NEW_FILECHOOSER:
-            SvgSaveDialog(self.image.export_svg,
-                          transient_for=app.app.get_active_window())
-        else:
-            SvgChooserDialog(self.image.export_svg)
+        SvgSaveDialog(self.image.export_svg,
+                      transient_for=app.app.get_active_window())
 
     def on_fg_color_button_color_set(self, widget):
         c = self.fg_color_select_button.get_rgba()