Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java,v
diff -u -r1.82.2.7 -r1.82.2.8
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	27 Nov 2016 06:51:35 -0000	1.82.2.7
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	20 Feb 2017 01:11:45 -0000	1.82.2.8
@@ -72,6 +72,9 @@
 import org.lamsfoundation.lams.tool.forum.web.forms.ForumPedagogicalPlannerForm;
 import org.lamsfoundation.lams.tool.forum.web.forms.MessageForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
+import org.lamsfoundation.lams.util.FileValidatorUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -186,6 +189,9 @@
 	forumForm.setContentFolderID(contentFolderID);
 	sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
 
+	sessionMap.put(ForumConstants.ATTR_UPLOAD_MAX_FILE_SIZE, 
+		FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)));
+
 	// get back the topic list and display them on page
 	forumService = getForumManager();
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java,v
diff -u -r1.85.2.9 -r1.85.2.10
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	13 Feb 2017 07:48:01 -0000	1.85.2.9
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	20 Feb 2017 01:11:45 -0000	1.85.2.10
@@ -233,7 +233,14 @@
 	sessionMap.put(ForumConstants.ATTR_LOCK_WHEN_FINISHED, forum.getLockWhenFinished());
 	sessionMap.put(ForumConstants.ATTR_USER_FINISHED, forumUser.isSessionFinished());
 	sessionMap.put(ForumConstants.ATTR_ALLOW_EDIT, forum.isAllowEdit());
+	
 	sessionMap.put(ForumConstants.ATTR_ALLOW_UPLOAD, forum.isAllowUpload());
+	int uploadMaxFileSize = Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE);
+	// it defaults to -1 if property was not found
+	if (uploadMaxFileSize > 0) {
+	    sessionMap.put(ForumConstants.ATTR_UPLOAD_MAX_FILE_SIZE, FileValidatorUtil.formatSize(uploadMaxFileSize));
+	}
+	
 	sessionMap.put(ForumConstants.ATTR_ALLOW_RATE_MESSAGES, forum.isAllowRateMessages());
 	sessionMap.put(ForumConstants.ATTR_MINIMUM_RATE, forum.getMinimumRate());
 	sessionMap.put(ForumConstants.ATTR_MAXIMUM_RATE, forum.getMaximumRate());
@@ -765,12 +772,6 @@
 	boolean hideReflection = WebUtil.readBooleanParam(request, ForumConstants.ATTR_HIDE_REFLECTION, false);
 	sessionMap.put(ForumConstants.ATTR_HIDE_REFLECTION, hideReflection);
 
-	int uploadMaxFileSize = Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE);
-	// it defaults to -1 if property was not found
-	if (uploadMaxFileSize > 0) {
-	    sessionMap.put(ForumConstants.ATTR_UPLOAD_MAX_FILE_SIZE, FileValidatorUtil.formatSize(uploadMaxFileSize));
-	}
-
 	return mapping.findForward("success");
     }
 
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/create.jsp,v
diff -u -r1.39.2.7 -r1.39.2.8
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	13 Sep 2016 09:21:58 -0000	1.39.2.7
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	20 Feb 2017 01:11:45 -0000	1.39.2.8
@@ -38,6 +38,11 @@
 			<div class="form-group">
 				<label for="attachmentFile"><fmt:message key="message.label.attachment" /></label>
 				<html:file tabindex="3" property="attachmentFile" styleClass="form-control"/><BR>
+				<p class="help-block">
+					<fmt:message key="label.upload.info">
+						<fmt:param>${sessionMap.uploadMaxFileSize}</fmt:param>
+					</fmt:message>
+				</p>
 				<html:errors property="message.attachment" />
 			</div>
 
Index: lams_tool_forum/web/jsps/authoring/parts/msgattachment.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/parts/msgattachment.jsp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- lams_tool_forum/web/jsps/authoring/parts/msgattachment.jsp	20 Oct 2016 22:17:28 -0000	1.4.2.2
+++ lams_tool_forum/web/jsps/authoring/parts/msgattachment.jsp	20 Feb 2017 01:11:45 -0000	1.4.2.3
@@ -26,5 +26,11 @@
 	</c:when>
 	<c:otherwise>
 		<input type="file" name="attachmentFile" class="form-control" />
+		<p class="help-block">
+			<fmt:message key="label.upload.info">
+				<fmt:param>${sessionMap.uploadMaxFileSize}</fmt:param>
+			</fmt:message>
+		</p>
+
 	</c:otherwise>
 </c:choose>
Index: lams_tool_forum/web/jsps/learning/message/topicform.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topicform.jsp,v
diff -u -r1.17.2.5 -r1.17.2.6
--- lams_tool_forum/web/jsps/learning/message/topicform.jsp	14 Sep 2016 03:41:36 -0000	1.17.2.5
+++ lams_tool_forum/web/jsps/learning/message/topicform.jsp	20 Feb 2017 01:11:45 -0000	1.17.2.6
@@ -15,6 +15,11 @@
 	<div class="form-group">
 		<label><fmt:message key="message.label.attachment" /></label><BR/>
 		<html:file tabindex="3" property="attachmentFile" /><BR/>
+		<p class="help-block">
+			<fmt:message key="label.upload.info">
+				<fmt:param>${sessionMap.uploadMaxFileSize}</fmt:param>
+			</fmt:message>
+		</p>
 		<html:errors property="message.attachment" />
 	</div>
 </c:if>
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp,v
diff -u -r1.18.2.8 -r1.18.2.9
--- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	14 Sep 2016 03:42:32 -0000	1.18.2.8
+++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	20 Feb 2017 01:11:45 -0000	1.18.2.9
@@ -16,11 +16,11 @@
 		<label><fmt:message key="message.label.attachment" />&nbsp;</label>
 		<html:file tabindex="3" property="attachmentFile" />
 
-		<div style="font-style: italic; margin-top: 10px">
+		<p class="help-block">
 			<fmt:message key="label.upload.info">
 				<fmt:param>${sessionMap.uploadMaxFileSize}</fmt:param>
 			</fmt:message>
-		</div>
+		</p>
 		<html:errors property="message.attachment" />
 	</div>
 </c:if>