diff --git a/TODO b/TODO
index 638a786..ce7ff0c 100644
--- a/TODO
+++ b/TODO
@@ -17,4 +17,3 @@ bugs:
   considerable tweaks to python-twitter)
 * "ValueError: list.remove(x): x not in list" when trying to close a tab (error recurred after adding conversation support).  Tabs can be reordered, then closed, as a workaround.
 * Links must be right-clicked on to activate - can't left-click on the link directly.  This seems to be a pygtk issue
-* Double-quotes are not parsed correctly in tweets
diff --git a/twitterwidgets.py b/twitterwidgets.py
index a88cda2..703e92f 100644
--- a/twitterwidgets.py
+++ b/twitterwidgets.py
@@ -372,6 +372,7 @@ class TweetBox(gtk.HBox):
         # and the text
         new_text = status.text
         new_text = re.sub(r'&([^;]*?)( |$)', r'&\1\2', new_text)
+        new_text = re.sub(r'"([^;]*?)( |$)', r'"\1\2', new_text)
         if gtk.gtk_version[0] > 2 or (gtk.gtk_version[0] == 2 and gtk.gtk_version[1] >= 18):
             new_text = re.sub(r"(http://.*?)( |$)", r'<a href="\1">\1</a>\2', new_text)
             new_text = re.sub(r'@(.*?)( |$)', r'@<a href="@\1">\1</a>\2', new_text)