diff --git a/mytwitter.py b/mytwitter.py
index dc35644..c7aeed2 100755
--- a/mytwitter.py
+++ b/mytwitter.py
@@ -207,7 +207,10 @@ class TweetBox(gtk.VBox):
         self.header.set_markup(user.name + " (" + user.screen_name + ") " + timestring)
 
         # and the text
-        self.text.set_markup(status.text)
+        new_text = status.text
+        new_text = re.sub('& ', '& ', new_text)
+        link_text = re.sub(r"(http://.*?)( |$)", r'<a href="\1">\1</a>\2', new_text)
+        self.text.set_markup(new_text)
 
 
     def on_reply_clicked(self, widget):