Merged r1492 to r1498 from trunk.

git-svn-id: http://redmine.rubyforge.org/svn/branches/0.7-stable@1529 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/views/issues/index.rhtml

@@ -45,7 +45,7 @@
 
 <p class="other-formats">
 <%= l(:label_export_to) %>
-<span><%= link_to 'Atom', {:format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
+<span><%= link_to 'Atom', {:query_id => @query, :format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
 <span><%= link_to 'CSV', {:format => 'csv'}, :class => 'csv' %></span>
 <span><%= link_to 'PDF', {:format => 'pdf'}, :class => 'pdf' %></span>
 </p>

app/views/messages/show.rhtml

@@ -17,6 +17,7 @@
 </div>
 <br />
 
+<% unless @replies.empty? %>
 <h3 class="icon22 icon22-comment"><%= l(:label_reply_plural) %></h3>
 <% @replies.each do |message| %>
   <a name="<%= "message-#{message.id}" %>"></a>
@@ -30,6 +31,7 @@
   <%= link_to_attachments message.attachments, :no_author => true %>
   </div>
 <% end %>
+<% end %>
 
 <% if !@topic.locked? && authorize_for('messages', 'reply') %>
 <p><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></p>