Index: assignment-bundles/resources/assignment.properties
===================================================================
--- assignment-bundles/resources/assignment.properties	(revision 307590)
+++ assignment-bundles/resources/assignment.properties	(working copy)
@@ -915,3 +915,6 @@
 peerassessment.submitted=Submitted
 peerassessment.student=Student {0}
 peerassessment.draftInProgress=Draft - in progress
+
+gen.att.single = Attachment
+gen.stuatt.single = Submitted Attachment
Index: assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/BaseAssignmentService.java
===================================================================
--- assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/BaseAssignmentService.java	(revision 307590)
+++ assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/BaseAssignmentService.java	(working copy)
@@ -3100,7 +3100,16 @@
 		List attachments = s.getSubmittedAttachments();
 		if (attachments != null && attachments.size() >0)
 		{
-			buffer.append(rb.getString("gen.att") + newline + newline);
+			if (a.getContent().getTypeOfSubmission() == Assignment.SINGLE_ATTACHMENT_SUBMISSION) 
+			{
+				buffer.append(rb.getString("gen.att.single"));
+			} 
+			else 
+			{
+				buffer.append(rb.getString("gen.att"));
+			}
+			buffer.append(newline).append(newline);
+			
 			for (int j = 0; j<attachments.size(); j++)
 			{
 				Reference r = (Reference) attachments.get(j);
Index: assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
===================================================================
--- assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java	(revision 307590)
+++ assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java	(working copy)
@@ -1697,6 +1697,7 @@
 				context.put("textSubmissionOnly", Boolean.FALSE);
 			}
 			
+			context.put("submissionType", submissionType);
 			
 			AssignmentSubmission s = getSubmission(currentAssignmentReference, submitter, "build_student_view_submission_confirmation_context",state);
 			if (s != null)
Index: assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission.vm
===================================================================
--- assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission.vm	(revision 307590)
+++ assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission.vm	(working copy)
@@ -387,7 +387,13 @@
 				## submitted attachment
 				
 			 #if ($submissionType!=1 && $submissionType!=4) ## do not show attach messages if no attach are allowed...
-					<h3>$tlang.getString("gen.stuatt")</h3>
+					<h3>
+						#if ($submissionType == 5)
+							$tlang.getString("gen.stuatt.single")
+						#else
+							$tlang.getString("gen.stuatt")
+						#end
+					</h3>
 					#set ($size = 0)
 					#if ($!submission.submitted || !$alertGradeDraft)
 						#set ($props = false)
Index: assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm
===================================================================
--- assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm	(revision 307590)
+++ assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm	(working copy)
@@ -894,7 +894,13 @@
 	#end
 	#if ($size == 0)
 	#else
-		<h4>$tlang.getString("gen.att")</h4>
+		<h4>
+			#if ($assignment.getContent().getTypeOfSubmission() == 5)
+				$tlang.getString("gen.att.single")
+			#else
+				$tlang.getString("gen.att")
+			#end
+		</h4>
 		<ul class="attachList indnt1">
 			#foreach ($attachment in $attachments) 
 				#set ($props = false)
Index: assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_preview_grading_submission.vm
===================================================================
--- assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_preview_grading_submission.vm	(revision 307590)
+++ assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_preview_grading_submission.vm	(working copy)
@@ -159,8 +159,12 @@
 			#end
 			#if ($size == 0)
 			#else
-				<h4> 
-					$tlang.getString("gen.stuatt")
+				<h4>
+					#if ($submissionType == 5)
+						$tlang.getString("gen.stuatt.single")
+					#else
+						$tlang.getString("gen.stuatt")
+					#end
 				</h4>	
 				<ul class="attachList indnt1">
 					#foreach ($attachment in $submission.SubmittedAttachments) 
Index: assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_view_assignment.vm
===================================================================
--- assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_view_assignment.vm	(revision 307590)
+++ assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_view_assignment.vm	(working copy)
@@ -421,7 +421,11 @@
 								$tlang.getString("viewassig.theassall3") 
 						#end
 						<h4>
-							$tlang.getString("gen.att")
+							#if ($submissionType == 5)
+								$tlang.getString("gen.att.single")
+							#else
+								$tlang.getString("gen.att")
+							#end
 						</h4>
 						<p class="instruction">$tlang.getString("gen.noatt")</p> 
 						<p class="act">
Index: assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_preview_submission.vm
===================================================================
--- assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_preview_submission.vm	(revision 307590)
+++ assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_preview_submission.vm	(working copy)
@@ -111,7 +111,11 @@
 	##							$tlang.getString("gen.noatt")
 	#else
 		<h4>
-			$tlang.getString("gen.att")
+			#if ($assignment.getContent().getTypeOfSubmission() == 5)
+				$tlang.getString("gen.att.single")
+			#else
+				$tlang.getString("gen.att")
+			#end
 		</h4>	
 			<ul class="attachList indnt1">
 				#foreach ($attachment in $attachments) 
Index: assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_view_grade.vm
===================================================================
--- assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_view_grade.vm	(revision 307590)
+++ assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_view_grade.vm	(working copy)
@@ -330,7 +330,13 @@
 			#if ($size == 0)
 				##$tlang.getString("gen.noatt")
 			#else
-				<h5>$tlang.getString("gen.stuatt")</h5>
+				<h5>
+					#if ($assignment.getContent().getTypeOfSubmission() == 5)
+						$tlang.getString("gen.stuatt.single")
+					#else
+						$tlang.getString("gen.stuatt")
+					#end
+				</h5>
 					<ul class="attachList indnt1">
 					#foreach ($attachment in $submittedAttachments) 
 						#set ($props = false)
Index: assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm
===================================================================
--- assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm	(revision 307590)
+++ assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm	(working copy)
@@ -662,7 +662,11 @@
 				#end	
 				<div class="highlightPanel" style="background:#ffe">
 					<h3 style="margin-top:0;margin-bottom:.5em">
-						$tlang.getString("gen.att")
+						#if ($submissionType == 5)
+							$tlang.getString("gen.att.single")
+						#else
+							$tlang.getString("gen.att")
+						#end
 					</h3>	
 					#if ($assignment.getContent().getAllowReviewService())
 						<p class="instruction"><img alt="$reviewIndicator" title="$reviewIndicator" src="/library/image/silk/rosette.png" /> $reviewIndicator</p>
Index: assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission_confirmation.vm
===================================================================
--- assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission_confirmation.vm	(revision 307590)
+++ assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission_confirmation.vm	(working copy)
@@ -154,7 +154,11 @@
 		#if (!$textSubmissionOnly)
 			<h4>
 				#if ($!submitted)
-					$tlang.getString('gen.stuatt')
+					#if ($submissionType == 5)
+						$tlang.getString("gen.stuatt.single")
+					#else
+						$tlang.getString("gen.stuatt")
+					#end
 				#else
 					$tlang.getString('confirm.savesubmission.attachments')
 				#end