     latestCommentText = @refs?.markdownText?.textContent
     @setState({latestCommentText}) if latestCommentText
 
-  discussionLink: (childtext, className = '') ->
+  discussionLink: (childtext = '', query = {}, className = '') ->
     if @props.params?.owner and @props.params?.name
       {owner, name} = @props.params
-      <Link className={className} to="/projects/#{owner}/#{name}/talk/#{@props.discussion.board_id}/#{@props.discussion.id}">
+      <Link className={className} to={@history.createHref("/projects/#{owner}/#{name}/talk/#{@props.discussion.board_id}/#{@props.discussion.id}", query)}>
         {childtext}
       </Link>
     else
-      <Link className={className} to="/talk/#{@props.discussion.board_id}/#{@props.discussion.id}">
+      <Link className={className} to={@history.createHref("/talk/#{@props.discussion.board_id}/#{@props.discussion.id}", query)}>
         {childtext}
       </Link>
 


        <span>
          {if discussion.title and @props.title
            @discussionLink(discussion.title)}{' '}
        </span>

        {@discussionLink(timeAgo(comment.created_at), "latest-comment-time")}

        {if @props.preview
          @discussionLink(" #{truncate(@state.latestCommentText, '...')}", "latest-comment-preview-link")}

      </div>
    </div>

DisplayRoles = require './lib/display-roles'
Avatar = require '../partials/avatar'
PromiseRenderer = require '../components/promise-renderer'
{Link, History} = require 'react-router'
merge = require 'lodash.merge'
{Markdown} = require 'markdownz'

