app/controllers/issues_controller.rb | 2 ++
 app/views/issues/index.html.erb      | 9 ++++++++-
 config/locales/de.yml                | 3 ++-
 config/locales/en-GB.yml             | 1 +
 config/locales/en.yml                | 1 +
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 3f3966a..58f3e74 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -69,6 +69,8 @@ class IssuesController < ApplicationController
       else
         @limit = per_page_option
       end
+      
+      @csv_limit = Setting.issues_export_limit.to_i
 
       @issue_count = @query.issue_count
       @issue_pages = Paginator.new @issue_count, @limit, params['page']
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 0e4f940..ffa9f35 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -65,12 +65,19 @@
 
 <% other_formats_links do |f| %>
   <%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
-  <%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
+  <%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '350px'); return false;" %>
   <%= f.link_to 'PDF', :url => params %>
 <% end %>
 
 <div id="csv-export-options" style="display:none;">
   <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
+  
+  <% if @issue_count > @csv_limit%>
+  <div class="flash warning">
+    <%= l(:warning_export_limit, :export => @csv_limit, :total => @issue_count) %>
+  </div>
+  <% end %>
+  
   <%= form_tag(params.merge({:format => 'csv',:page=>nil}), :method => :get, :id => 'csv-export-form') do %>
   <p>
     <label><%= radio_button_tag 'columns', '', true %> <%= l(:description_selected_columns) %></label><br />
diff --git a/config/locales/de.yml b/config/locales/de.yml
index d1440e5..9dc8c9e 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -744,6 +744,7 @@ de:
   label_today: heute
   label_topic_plural: Themen
   label_total: Gesamtzahl
+  label_total_time: Gesamtzeit
   label_tracker: Tracker
   label_tracker_new: Neuer Tracker
   label_tracker_plural: Tracker
@@ -1099,4 +1100,4 @@ de:
   version_status_open: offen
 
   warning_attachments_not_saved: "%{count} Datei(en) konnten nicht gespeichert werden."
-  label_total_time: Gesamtzeit
+  warning_export_limit: "Der Export wird nur %{export} von %{total} Tickets enthalten!"
\ No newline at end of file
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 93a0401..66ee2f1 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1090,3 +1090,4 @@ en-GB:
   field_generate_password: Generate password
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: Total
+  warning_export_limit: "Export contains only %{export} of %{total}! issues!"
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2719c10..9ee840c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1083,3 +1083,4 @@ en:
   description_date_from: Enter start date
   description_date_to: Enter end date
   text_repository_identifier_info: 'Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.'
+  warning_export_limit: "Export contains only %{export} of %{total}! issues!"
\ No newline at end of file