diff --git a/src/wxUI/dialogs/message.py b/src/wxUI/dialogs/message.py
index d296ed2e..60919ffc 100644
--- a/src/wxUI/dialogs/message.py
+++ b/src/wxUI/dialogs/message.py
@@ -79,10 +79,10 @@ class tweet(textLimited):
   self.shortenButton.Disable()
   self.unshortenButton.Disable()
   self.translateButton = wx.Button(self.panel, -1, _(u"&Translate..."), size=wx.DefaultSize)
-  self.autocompletionButton = wx.Button(self.panel, -1, _(u"&Autocomplete users"))
-  self.okButton = wx.Button(self.panel, wx.ID_OK, _(u"&Send"), size=wx.DefaultSize)
+  self.autocompletionButton = wx.Button(self.panel, -1, _(u"Auto&complete users"))
+  self.okButton = wx.Button(self.panel, wx.ID_OK, _(u"Sen&d"), size=wx.DefaultSize)
   self.okButton.SetDefault()
-  cancelButton = wx.Button(self.panel, wx.ID_CANCEL, _(u"&Close"), size=wx.DefaultSize)
+  cancelButton = wx.Button(self.panel, wx.ID_CANCEL, _(u"C&lose"), size=wx.DefaultSize)
   self.buttonsBox1 = wx.BoxSizer(wx.HORIZONTAL)
   self.buttonsBox1.Add(self.upload_image, 0, wx.ALL, 10)
   self.buttonsBox1.Add(self.spellcheck, 0, wx.ALL, 10)
@@ -131,18 +131,18 @@ class retweet(tweet):
   self.retweetBox.Add(self.text2, 0, wx.ALL, 5)
   self.mainBox.Add(self.textBox, 0, wx.ALL, 5)
   self.mainBox.Add(self.retweetBox, 0, wx.ALL, 5)
-  self.upload_image = wx.Button(self.panel, -1, _(u"Upload a picture"), size=wx.DefaultSize)
-  self.spellcheck = wx.Button(self.panel, -1, _("Spelling correction"), size=wx.DefaultSize)
-  self.attach = wx.Button(self.panel, -1, _(u"Attach audio"), size=wx.DefaultSize)
-  self.shortenButton = wx.Button(self.panel, -1, _(u"Shorten URL"), size=wx.DefaultSize)
-  self.unshortenButton = wx.Button(self.panel, -1, _(u"Expand URL"), size=wx.DefaultSize)
+  self.upload_image = wx.Button(self.panel, -1, _(u"&Upload image..."), size=wx.DefaultSize)
+  self.spellcheck = wx.Button(self.panel, -1, _("Check &spelling..."), size=wx.DefaultSize)
+  self.attach = wx.Button(self.panel, -1, _(u"&Attach audio..."), size=wx.DefaultSize)
+  self.shortenButton = wx.Button(self.panel, -1, _(u"Sh&orten URL"), size=wx.DefaultSize)
+  self.unshortenButton = wx.Button(self.panel, -1, _(u"&Expand URL"), size=wx.DefaultSize)
   self.shortenButton.Disable()
   self.unshortenButton.Disable()
-  self.translateButton = wx.Button(self.panel, -1, _(u"Translate message"), size=wx.DefaultSize)
-  self.autocompletionButton = wx.Button(self.panel, -1, _(u"&Autocomplete users"))
-  self.okButton = wx.Button(self.panel, wx.ID_OK, _(u"Send"), size=wx.DefaultSize)
+  self.translateButton = wx.Button(self.panel, -1, _(u"&Translate..."), size=wx.DefaultSize)
+  self.autocompletionButton = wx.Button(self.panel, -1, _(u"Auto&complete users"))
+  self.okButton = wx.Button(self.panel, wx.ID_OK, _(u"Sen&d"), size=wx.DefaultSize)
   self.okButton.SetDefault()
-  cancelButton = wx.Button(self.panel, wx.ID_CANCEL, _(u"Close"), size=wx.DefaultSize)
+  cancelButton = wx.Button(self.panel, wx.ID_CANCEL, _(u"C&lose"), size=wx.DefaultSize)
   self.buttonsBox1 = wx.BoxSizer(wx.HORIZONTAL)
   self.buttonsBox1.Add(self.upload_image, 0, wx.ALL, 10)
   self.buttonsBox1.Add(self.spellcheck, 0, wx.ALL, 10)
@@ -182,9 +182,9 @@ class dm(textLimited):
  def createControls(self, title, message,  users):
   self.panel = wx.Panel(self)
   self.mainBox = wx.BoxSizer(wx.VERTICAL)
-  label = wx.StaticText(self.panel, -1, _(u"Recipient"))
+  label = wx.StaticText(self.panel, -1, _(u"&Recipient"))
   self.cb = wx.ComboBox(self.panel, -1, choices=users, value=users[0], size=wx.DefaultSize)
-  self.autocompletionButton = wx.Button(self.panel, -1, _(u"&Autocomplete users"))
+  self.autocompletionButton = wx.Button(self.panel, -1, _(u"Auto&complete users"))
   self.createTextArea(message, text="")
   userBox = wx.BoxSizer(wx.HORIZONTAL)
   userBox.Add(label, 0, wx.ALL, 5)
@@ -192,16 +192,16 @@ class dm(textLimited):
   userBox.Add(self.autocompletionButton, 0, wx.ALL, 5)
   self.mainBox.Add(userBox, 0, wx.ALL, 5)
   self.mainBox.Add(self.textBox, 0, wx.ALL, 5)
-  self.spellcheck = wx.Button(self.panel, -1, _("Spelling correction"), size=wx.DefaultSize)
-  self.attach = wx.Button(self.panel, -1, _(u"Attach audio"), size=wx.DefaultSize)
-  self.shortenButton = wx.Button(self.panel, -1, _(u"Shorten URL"), size=wx.DefaultSize)
-  self.unshortenButton = wx.Button(self.panel, -1, _(u"Expand URL"), size=wx.DefaultSize)
+  self.spellcheck = wx.Button(self.panel, -1, _("Check &spelling..."), size=wx.DefaultSize)
+  self.attach = wx.Button(self.panel, -1, _(u"&Attach audio..."), size=wx.DefaultSize)
+  self.shortenButton = wx.Button(self.panel, -1, _(u"Sh&orten URL"), size=wx.DefaultSize)
+  self.unshortenButton = wx.Button(self.panel, -1, _(u"&Expand URL"), size=wx.DefaultSize)
   self.shortenButton.Disable()
   self.unshortenButton.Disable()
-  self.translateButton = wx.Button(self.panel, -1, _(u"Translate message"), size=wx.DefaultSize)
-  self.okButton = wx.Button(self.panel, wx.ID_OK, _(u"Send"), size=wx.DefaultSize)
+  self.translateButton = wx.Button(self.panel, -1, _(u"&Translate..."), size=wx.DefaultSize)
+  self.okButton = wx.Button(self.panel, wx.ID_OK, _(u"Sen&d"), size=wx.DefaultSize)
   self.okButton.SetDefault()
-  cancelButton = wx.Button(self.panel, wx.ID_CANCEL, _(u"Close"), size=wx.DefaultSize)
+  cancelButton = wx.Button(self.panel, wx.ID_CANCEL, _(u"C&lose"), size=wx.DefaultSize)
   self.buttonsBox = wx.BoxSizer(wx.HORIZONTAL)
   self.buttonsBox.Add(self.spellcheck, 0, wx.ALL, 5)
   self.buttonsBox.Add(self.attach, 0, wx.ALL, 5)
@@ -291,11 +291,11 @@ class viewTweet(widgetUtils.BaseDialog):
   infoBox.Add(favsBox, 0, wx.ALL, 5)
   infoBox.Add(sourceBox, 0, wx.ALL, 5)
   mainBox.Add(infoBox, 0, wx.ALL, 5)
-  self.spellcheck = wx.Button(panel, -1, _("Spelling correction"), size=wx.DefaultSize)
-  self.unshortenButton = wx.Button(panel, -1, _(u"Expand URL"), size=wx.DefaultSize)
+  self.spellcheck = wx.Button(panel, -1, _("Check &spelling..."), size=wx.DefaultSize)
+  self.unshortenButton = wx.Button(panel, -1, _(u"&Expand URL"), size=wx.DefaultSize)
   self.unshortenButton.Disable()
-  self.translateButton = wx.Button(panel, -1, _(u"Translate message"), size=wx.DefaultSize)
-  cancelButton = wx.Button(panel, wx.ID_CANCEL, _(u"Close"), size=wx.DefaultSize)
+  self.translateButton = wx.Button(panel, -1, _(u"&Translate..."), size=wx.DefaultSize)
+  cancelButton = wx.Button(panel, wx.ID_CANCEL, _(u"C&lose"), size=wx.DefaultSize)
   cancelButton.SetDefault()
   buttonsBox = wx.BoxSizer(wx.HORIZONTAL)
   buttonsBox.Add(self.spellcheck, 0, wx.ALL, 5)
@@ -353,11 +353,11 @@ class viewNonTweet(widgetUtils.BaseDialog):
   textBox.Add(self.text, 1, wx.EXPAND, 5)
   mainBox = wx.BoxSizer(wx.VERTICAL)
   mainBox.Add(textBox, 0, wx.ALL, 5)
-  self.spellcheck = wx.Button(panel, -1, _("Spelling correction"), size=wx.DefaultSize)
-  self.unshortenButton = wx.Button(panel, -1, _(u"Expand URL"), size=wx.DefaultSize)
+  self.spellcheck = wx.Button(panel, -1, _("Check &spelling..."), size=wx.DefaultSize)
+  self.unshortenButton = wx.Button(panel, -1, _(u"&Expand URL"), size=wx.DefaultSize)
   self.unshortenButton.Disable()
-  self.translateButton = wx.Button(panel, -1, _(u"Translate message"), size=wx.DefaultSize)
-  cancelButton = wx.Button(panel, wx.ID_CANCEL, _(u"Close"), size=wx.DefaultSize)
+  self.translateButton = wx.Button(panel, -1, _(u"&Translate..."), size=wx.DefaultSize)
+  cancelButton = wx.Button(panel, wx.ID_CANCEL, _(u"C&lose"), size=wx.DefaultSize)
   cancelButton.SetDefault()
   buttonsBox = wx.BoxSizer(wx.HORIZONTAL)
   buttonsBox.Add(self.spellcheck, 0, wx.ALL, 5)