--- a/mercurial/templates/rss/changelogentry.tmpl	Thu Apr 17 11:45:43 2014 -0700
+++ b/mercurial/templates/rss/changelogentry.tmpl	Thu Apr 17 11:47:49 2014 -0700
@@ -1,19 +1,19 @@
 <item>
-    <title>{branches%"{if(name, '[{name|escape}] ')}"}{desc|strip|firstline|strip|escape}</title>
+    <title>{inbranch%"{if(name, '[{name|escape}] ')}"}{branches%"{if(name, '[{name|escape}] ')}"}{desc|strip|firstline|strip|escape}</title>
     <guid isPermaLink="true">{urlbase}{url|urlescape}rev/{node|short}</guid>
     <description>
-	<![CDATA[
+              <![CDATA[
 	<table>
 	<tr>
 		<th style="text-align:left;">changeset</th>
 		<td>{node|short}</td>
-	</tr>
-	<tr>
-		<th style="text-align:left;">branch</th>
-		<td>{branches%"{name|escape}"}</td>
-	</tr>
-	<tr>
-		<th style="text-align:left;">bookmark</th>
+              </tr>
+              <tr>
+                              <th style="text-align:left;">branch</th>
+                              <td>{inbranch%"{name|escape}"}{branches%"{name|escape}"}</td>
+              </tr>
+              <tr>
+                              <th style="text-align:left;">bookmark</th>
 		<td>{bookmarks%"{name|escape}"}</td>
 	</tr>
 	<tr>