diff --git a/src/controller/buffers/mastodon/base.py b/src/controller/buffers/mastodon/base.py
index 523cdd4c..9fa5ade8 100644
--- a/src/controller/buffers/mastodon/base.py
+++ b/src/controller/buffers/mastodon/base.py
@@ -350,7 +350,7 @@ class BaseBuffer(base.Buffer):
 
     def share_item(self, *args, **kwargs):
         if self.can_share() == False:
-            return output.speak(_("This action is not supported on conversation posts."))
+            return output.speak(_("This action is not supported on conversations."))
         post = self.get_item()
         id = post.id
         if self.session.settings["general"]["boost_mode"] == "ask":
diff --git a/src/controller/mastodon/handler.py b/src/controller/mastodon/handler.py
index 5602a27e..348a9a8f 100644
--- a/src/controller/mastodon/handler.py
+++ b/src/controller/mastodon/handler.py
@@ -88,7 +88,7 @@ class Handler(object):
         pub.sendMessage("createBuffer", buffer_type="EmptyBuffer", session_type="base", buffer_title=_("Timelines"), parent_tab=root_position, start=False, kwargs=dict(parent=controller.view.nb, name="timelines", account=name))
         timelines_position =controller.view.search("timelines", name)
         for i in session.settings["other_buffers"]["timelines"]:
-                pub.sendMessage("createBuffer", buffer_type="BaseBuffer", session_type=session.type, buffer_title=_("Timelines for {}").format(i), parent_tab=timelines_position, start=False, kwargs=dict(parent=controller.view.nb, function="account_statuses", name="{}-timeline".format(i), sessionObject=session, account=name, sound="tweet_timeline.ogg", id=i))
+                pub.sendMessage("createBuffer", buffer_type="BaseBuffer", session_type=session.type, buffer_title=_("Timeline for {}").format(i), parent_tab=timelines_position, start=False, kwargs=dict(parent=controller.view.nb, function="account_statuses", name="{}-timeline".format(i), sessionObject=session, account=name, sound="tweet_timeline.ogg", id=i))
         for i in session.settings["other_buffers"]["followers_timelines"]:
             pub.sendMessage("createBuffer", buffer_type="UserBuffer", session_type=session.type, buffer_title=_("Followers for {}").format(i), parent_tab=timelines_position, start=False, kwargs=dict(parent=controller.view.nb, compose_func="compose_user", function="account_followers", name="{}-followers".format(i,), sessionObject=session, account=name, sound="new_event.ogg", id=i))
         for i in session.settings["other_buffers"]["following_timelines"]:
diff --git a/src/sessions/mastodon/session.py b/src/sessions/mastodon/session.py
index b500d3c2..e0f21f88 100644
--- a/src/sessions/mastodon/session.py
+++ b/src/sessions/mastodon/session.py
@@ -15,7 +15,6 @@ from pubsub import pub
 from mysc.thread_utils import call_threaded
 from sessions import base
 from sessions.mastodon import utils, streaming
-from .wxUI import authorisationDialog
 
 log = logging.getLogger("sessions.mastodonSession")
 
diff --git a/src/sessions/mastodon/wxUI.py b/src/sessions/mastodon/wxUI.py
deleted file mode 100644
index 009d1e55..00000000
--- a/src/sessions/mastodon/wxUI.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-import wx
-
-class authorisationDialog(wx.Dialog):
-    def __init__(self):
-        super(authorisationDialog, self).__init__(parent=None, title=_(u"Authorising account..."))
-        panel = wx.Panel(self)
-        sizer = wx.BoxSizer(wx.VERTICAL)
-        static1 = wx.StaticText(panel, wx.NewId(), _("URL of mastodon instance:"))
-        self.instance = wx.TextCtrl(panel, -1)
-        sizer1 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer1.Add(static1, 0, wx.ALL, 5)
-        sizer1.Add(self.instance, 0, wx.ALL, 5)
-        sizer.Add(sizer1, 0, wx.ALL, 5)
-        static2 = wx.StaticText(panel, wx.NewId(), _("Email address:"))
-        self.email = wx.TextCtrl(panel, -1)
-        sizer2 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer2.Add(static2, 0, wx.ALL, 5)
-        sizer2.Add(self.email, 0, wx.ALL, 5)
-        sizer.Add(sizer2, 0, wx.ALL, 5)
-        static3 = wx.StaticText(panel, wx.NewId(), _("Password:"))
-        self.password = wx.TextCtrl(panel, -1)
-        sizer3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer3.Add(static3, 0, wx.ALL, 5)
-        sizer3.Add(self.password, 0, wx.ALL, 5)
-        sizer.Add(sizer3, 0, wx.ALL, 5)
-        self.ok = wx.Button(panel, wx.ID_OK)
-        self.cancel = wx.Button(panel, wx.ID_CANCEL)
-        sizer4 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer4.Add(self.ok, 0, wx.ALL, 5)
-        sizer4.Add(self.cancel, 0, wx.ALL, 5)
-        sizer.Add(sizer4, 0, wx.ALL, 5)
-        panel.SetSizer(sizer)
-        min = sizer.CalcMin()
-        self.SetClientSize(min)