--- loncom/homework/inputtags.pm	2012/06/08 12:25:54	1.303
+++ loncom/homework/inputtags.pm	2012/08/03 15:15:56	1.305
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.303 2012/06/08 12:25:54 raeburn Exp $
+# $Id: inputtags.pm,v 1.305 2012/08/03 15:15:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1139,7 +1139,17 @@ sub decideoutput {
     if (&Apache::lonhomework::hide_problem_status()
 	&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER'
 	&& &hide_award($award)) {
-	$message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
+        $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
+        my @interval= &Apache::lonnet::EXT("resource.$part.interval");
+        if ($interval[0] =~ /\d+/) {
+            my $first_access=&Apache::lonnet::get_first_access($interval[1]);
+            if (defined($first_access)) {
+                my $due_date= &Apache::lonnet::EXT("resource.$part.duedate");
+                unless (($due_date) && ($due_date < $first_access + $interval[0])) { 
+                    $message = &mt("Answer Submitted: Your final submission will be graded when the time limit is reached.");
+                }
+            }
+        }
 	$css_class=$possible_class{'no_grade'};
 	$button=1;
     }
@@ -1512,10 +1522,14 @@ sub gradestatus {
          && $status ne 'RESERVABLE_LATER'
          && $status ne 'NOTRESERVABLE') {
 
+	if ($status eq 'SHOW_ANSWER') {
+            $showbutton = 0;
+        }
+
 	($previousmsg,$latemessage,$message,$trystr) =
 	    &get_grade_messages($id,"resource.$id",$target,$status,
 				$showbutton);
-	if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
+	if ($status eq 'CANNOT_ANSWER') {
 	    $showbutton = 0;
 	}
 	if ( $status eq 'SHOW_ANSWER') {