diff --git a/r2/r2/templates/message.compact b/r2/r2/templates/message.compact
index 34f967304..a72e2b007 100644
--- a/r2/r2/templates/message.compact
+++ b/r2/r2/templates/message.compact
@@ -56,16 +56,16 @@
   <%
    author = WrappedUser(thing.author, thing.attribs, thing).render()
    if thing.sr_id:
-     subreddit = '<a href="%s.compact">%s</a>' % (thing.subreddit.path, 
-                                          thing.subreddit.name)
+     subreddit = '&nbsp;<a href="%s.compact">%s</a>&nbsp;' % \
+                   (thing.subreddit.path, thing.subreddit.path)
      if not thing.dest:
        thing.dest = subreddit
      author = thing.updated_author % dict(author=author, subreddit=subreddit)
    
-   taglinetext = thing.taglinetext % dict(when=thing.timesince,
-                                          author=u"<b>%s</b>" % author,
-                                          dest=u"<b>%s</b>" % thing.dest)
-   taglinetext = taglinetext.replace(' ', '&nbsp;')
+   taglinetext = thing.taglinetext.replace(' ', '&nbsp;')
+   taglinetext = taglinetext % dict(when=thing.timesince,
+                                    author=u"<b>%s</b>" % author,
+                                    dest=u"<b>%s</b>" % thing.dest)
   %>
     <div class="tagline">
       ${unsafe(taglinetext)}
diff --git a/r2/r2/templates/message.html b/r2/r2/templates/message.html
index ebc68d189..f9cb81a00 100644
--- a/r2/r2/templates/message.html
+++ b/r2/r2/templates/message.html
@@ -53,16 +53,16 @@ ${parent.thing_css_class(what)} ${"new" if thing.new else ""} ${"was-comment" if
   <%
    author = WrappedUser(thing.author, thing.attribs, thing).render()
    if thing.sr_id:
-     subreddit = '<a href="%s">%s</a>' % (thing.subreddit.path,
-                                          thing.subreddit.path)
+     subreddit = '&nbsp;<a href="%s">%s</a>&nbsp;' % (thing.subreddit.path,
+                                                      thing.subreddit.path)
      if not thing.dest:
        thing.dest = subreddit
      author = thing.updated_author % dict(author=author, subreddit=subreddit)
    
-   taglinetext = thing.taglinetext % dict(when=thing.timesince,
-                                          author=u"<b>%s</b>" % author,
-                                          dest=u"<b>%s</b>" % thing.dest)
-   taglinetext = taglinetext.replace(' ', '&nbsp;')
+   taglinetext = thing.taglinetext.replace(' ', '&nbsp;')
+   taglinetext = taglinetext % dict(when=thing.timesince,
+                                    author=u"<b>%s</b>" % author,
+                                    dest=u"<b>%s</b>" % thing.dest)
   %>
   ${unsafe(taglinetext)}
   </span>