diff --git a/mitterlib/ui/ui_pygtk.py b/mitterlib/ui/ui_pygtk.py
index 71745da..b66b2de 100644
--- a/mitterlib/ui/ui_pygtk.py
+++ b/mitterlib/ui/ui_pygtk.py
@@ -291,7 +291,7 @@ class Interface(object):
             <separator />
             <toolitem action="Delete" />
             <toolitem action="Reply" />
-            <toolitem action="Retweet" />
+            <toolitem action="Repost" />
             <separator />
             <toolitem action="Settings" />
             <toolitem action="Quit" />
@@ -312,7 +312,7 @@ class Interface(object):
             <menu action="Message">
               <menuitem action="Delete" />
               <menuitem action="Reply" />
-              <menuitem action="Retweet" />
+              <menuitem action="Repost" />
             </menu>
             <menu action="Help">
               <menuitem action="About" />
@@ -393,12 +393,12 @@ class Interface(object):
         action_group.add_action(self._reply_action)
         
         # TODO: Find a better word (non-network related) to this
-        self._retweet_action = gtk.Action('Retweet', 'Re_tweet',
+        self._repost_action = gtk.Action('Repost', 'Re_post',
                 "Put someone's else message on your timeline", 
                 gtk.STOCK_CONVERT)
-        self._retweet_action.set_property('sensitive', False)
+        self._repost_action.set_property('sensitive', False)
         # TODO: Connect
-        action_group.add_action(self._retweet_action)
+        action_group.add_action(self._repost_action)
 
         # Help actions
         about_action = gtk.Action('About', '_About', 'About Mitter',
@@ -680,7 +680,7 @@ class Interface(object):
 
         self._delete_action.set_property('sensitive', user_owned)
         self._reply_action.set_property('sensitive', not user_owned)
-        self._retweet_action.set_property('sensitive', not user_owned)
+        self._repost_action.set_property('sensitive', not user_owned)
         
         return 0