Index: lams_tool_forum/web/jsps/authoring/message/topiclist.jsp
===================================================================
diff -u -r267d34a8fb97edc3633276e0f3b1a49366fcef45 -r3fbae12edb0a13991ebd07c4f2ebdfbb02d5df99
--- lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision 267d34a8fb97edc3633276e0f3b1a49366fcef45)
+++ lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision 3fbae12edb0a13991ebd07c4f2ebdfbb02d5df99)
@@ -11,19 +11,15 @@
 		<c:forEach items="${sessionMap.topicList}" var="topic" varStatus="status">
 			<tr>
 				<td>
-					
-					<c:if test="${topic.hasAttachment}">
-						<img src="<html:rewrite page="/images/paperclip.gif" />" class="space-right float-right">
-					</c:if>
-					
 					<c:set var="viewtopic">
 						<html:rewrite page="/authoring/viewTopic.do?sessionMapID=${sessionMapID}&topicIndex=${status.index}&create=${topic.message.updated.time}" />
 					</c:set> 
 					<html:link href="javascript:showMessage('${viewtopic}')">
 						<c:out value="${topic.message.subject}" />
 					</html:link>
-				
-					
+					<c:if test="${topic.hasAttachment}">
+						<img src="<html:rewrite page="/images/paperclip.gif" />">
+					</c:if>
 				</td>
 			</tr>
 		</c:forEach>
Index: lams_tool_forum/web/jsps/authoring/message/view.jsp
===================================================================
diff -u -r267d34a8fb97edc3633276e0f3b1a49366fcef45 -r3fbae12edb0a13991ebd07c4f2ebdfbb02d5df99
--- lams_tool_forum/web/jsps/authoring/message/view.jsp	(.../view.jsp)	(revision 267d34a8fb97edc3633276e0f3b1a49366fcef45)
+++ lams_tool_forum/web/jsps/authoring/message/view.jsp	(.../view.jsp)	(revision 3fbae12edb0a13991ebd07c4f2ebdfbb02d5df99)
@@ -29,19 +29,15 @@
 
 			<c:if test="${not empty topic.message.attachments}">
 				<tr>
-					<td>
-						<ul>
+					<td><img src="<html:rewrite page="/images/paperclip.gif"/>" class="space-left float-left">
 							<c:forEach var="file" items="${topic.message.attachments}">
-								<li>
 									<c:set var="downloadURL">
 										<html:rewrite
 											page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
 									</c:set>
 									<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
 										<c:out value="${file.fileName}" /> </a>
-								</li>
 							</c:forEach>
-						</ul>
 					</td>
 				</tr>
 			</c:if>
Index: lams_tool_forum/web/jsps/learning/message/msgattachment.jsp
===================================================================
diff -u -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d -r3fbae12edb0a13991ebd07c4f2ebdfbb02d5df99
--- lams_tool_forum/web/jsps/learning/message/msgattachment.jsp	(.../msgattachment.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
+++ lams_tool_forum/web/jsps/learning/message/msgattachment.jsp	(.../msgattachment.jsp)	(revision 3fbae12edb0a13991ebd07c4f2ebdfbb02d5df99)
@@ -5,7 +5,7 @@
 <c:if test="${topic.hasAttachment}">
 <table border="0" class="align-left" style="width:400px">
 	<c:forEach var="file" items="${topic.message.attachments}">
-		<tr><td>
+		<tr><td><fmt:message key="message.label.attachment"/>: 
 		<c:set var="downloadURL">
 			<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
 		</c:set>
Index: lams_tool_forum/web/jsps/learning/message/topiclist.jsp
===================================================================
diff -u -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d -r3fbae12edb0a13991ebd07c4f2ebdfbb02d5df99
--- lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
+++ lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision 3fbae12edb0a13991ebd07c4f2ebdfbb02d5df99)
@@ -19,16 +19,16 @@
 		<c:forEach items="${topicList}" var="topic">
 			<tr>
 				<td>
-					<c:if test="${topic.hasAttachment}">
-						<img src="<html:rewrite page="/images/paperclip.gif"/>" class="space-right float-right">
-					</c:if>
-					
 					<c:set var="viewtopic">
 						<html:rewrite page="/learning/viewTopic.do?sessionMapID=${sessionMapID}&topicID=${topic.message.uid}&create=${topic.message.created.time}" />
 					</c:set>
 					<html:link href="${viewtopic}">
 						<c:out value="${topic.message.subject}" />
 					</html:link>
+					<c:if test="${topic.hasAttachment}">
+						<img src="<html:rewrite page="/images/paperclip.gif"/>">
+					</c:if>
+
 				</td>
 				<td>
 					<c:set var="author" value="${topic.author}"/>
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
diff -u -r3d4899782f4d431ae77ae17fd46ca82be4883789 -r3fbae12edb0a13991ebd07c4f2ebdfbb02d5df99
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 3d4899782f4d431ae77ae17fd46ca82be4883789)
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 3fbae12edb0a13991ebd07c4f2ebdfbb02d5df99)
@@ -47,25 +47,22 @@
 
 			<c:if test="${not empty msgDto.message.attachments}">
 				<tr>
-					<td>
-						<ul>
+					<td><img src="<html:rewrite page="/images/paperclip.gif"/>" class="space-left float-left">
 						<c:if
-							test='${(not hidden) || (hidden && sessionMap.mode == "teacher")}'>
+							test='${(not hidden) || (hidden && sessionMap.mode == "teacher")}'> 
 							<c:forEach var="file" items="${msgDto.message.attachments}">
-								<li>
 								<c:set var="downloadURL">
 									<html:rewrite
 										page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
 								</c:set>
 								<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
 									<c:out value="${file.fileName}" /> </a>
-								</li>
 							</c:forEach>
 						</c:if>
 						<c:if test='${hidden}'>
 							<fmt:message key="topic.message.attachment.hidden" />
 						</c:if>
-						<ul>
+						</div>
 					</td>
 				</tr>
 			</c:if>