diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 69c8e79..205c2e2 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -144,6 +144,13 @@ class IssuesController < ApplicationController
       @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, 
                                                                                                        :customized => @issue,
                                                                                                        :value => (params[:custom_fields] ? params[:custom_fields][x.id.to_s] : nil)) }
+      # Default end date for the issue is the fixed version's effective date if a fixed version
+      # is specified.
+      
+      @issue.due_date ||= @issue.fixed_version.effective_date if @issue.fixed_version &&
+                                                                 @issue.fixed_version.effective_date &&
+                                                                 @issue.fixed_version.effective_date > Date.today
+      
       @issue.custom_values = @custom_values
       if @issue.save
         attach_files(@issue, params[:attachments])