Index: templates/timeline.rss
===================================================================
--- templates/timeline.rss      (revision 4295)
+++ templates/timeline.rss      (working copy)
@@ -20,9 +20,9 @@
    <pubDate>${http_date(event.date)}</pubDate>
    <link>${event.abs_href(req)}</link>
    <guid isPermaLink="false">${event.abs_href(req)}/${event.dateuid}</guid>
-   <description>${
-     event.message
-   }<py:if test="event.wiki">${wiki_to_html(event.wiki, absurls=True)}</py:if></description>
+   <description py:with="wikify = event.use_oneliner and partial(wiki_to_oneliner, shorten=event.shorten_oneliner) or wiki_to_html">${
+     event.markup
+   }<py:if test="event.message">${wikify(event.message, absurls=True)}</py:if></description>
   </item>

  </channel>