diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml
index 3b6ce650..7c381d82 100644
--- a/app/views/issues/index.rhtml
+++ b/app/views/issues/index.rhtml
@@ -46,9 +46,9 @@
 <% end %>
 
 <% other_formats_links do |f| %>
-	<%= f.link_to 'Atom', :url => {:query_id => (@query.new_record? ? nil : @query), :key => User.current.rss_key} %>
-	<%= f.link_to 'CSV' %>
-	<%= f.link_to 'PDF' %>
+	<%= f.link_to 'Atom', :url => { :project_id => @project, :query_id => (@query.new_record? ? nil : @query), :key => User.current.rss_key } %>
+	<%= f.link_to 'CSV', :url => { :project_id => @project } %>
+	<%= f.link_to 'PDF', :url => { :project_id => @project } %>
 <% end %>
 
 <% end %>
diff --git a/test/integration/issues_test.rb b/test/integration/issues_test.rb
index 9f3c07f1..710fa5f7 100644
--- a/test/integration/issues_test.rb
+++ b/test/integration/issues_test.rb
@@ -88,5 +88,42 @@ class IssuesTest < ActionController::IntegrationTest
     Issue.find(1).attachments.each(&:destroy)
     assert_equal 0, Issue.find(1).attachments.length
   end
-
+  
+  def test_other_formats_links_on_get_index
+    get '/projects/ecookbook/issues'
+    
+    %w(Atom PDF CSV).each do |format|
+      assert_tag :a, :content => format,
+                     :attributes => { :href => "/projects/ecookbook/issues.#{format.downcase}",
+                                      :rel => 'nofollow' }
+    end
+  end
+  
+  def test_other_formats_links_on_post_index_without_project_id_in_url
+    post '/issues', :project_id => 'ecookbook'
+    
+    %w(Atom PDF CSV).each do |format|
+      assert_tag :a, :content => format,
+                     :attributes => { :href => "/projects/ecookbook/issues.#{format.downcase}",
+                                      :rel => 'nofollow' }
+    end
+  end
+  
+  def test_pagination_links_on_get_index
+    Setting.per_page_options = '2'
+    get '/projects/ecookbook/issues'
+    
+    assert_tag :a, :content => '2',
+                   :attributes => { :href => '/projects/ecookbook/issues?page=2' }
+    
+  end
+  
+  def test_pagination_links_on_post_index_without_project_id_in_url
+    Setting.per_page_options = '2'
+    post '/issues', :project_id => 'ecookbook'
+    
+    assert_tag :a, :content => '2',
+                   :attributes => { :href => '/projects/ecookbook/issues?page=2' }
+    
+  end
 end