Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java
===================================================================
diff -u -rda54b82e5ef860fe9f8872b75f2b1718cfb7de32 -r80f26384c618ffe6659131384045075a35e26b23
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision da54b82e5ef860fe9f8872b75f2b1718cfb7de32)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 80f26384c618ffe6659131384045075a35e26b23)
@@ -39,6 +39,7 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessages;
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
@@ -49,6 +50,7 @@
 import org.lamsfoundation.lams.tool.chat.service.IChatService;
 import org.lamsfoundation.lams.tool.chat.util.ChatConstants;
 import org.lamsfoundation.lams.tool.chat.web.forms.AuthoringForm;
+import org.lamsfoundation.lams.util.FileValidatorUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -264,6 +266,14 @@
 			savedFiles = getAttList(KEY_ONLINE_FILES, map);
 		}
 
+		ActionMessages errors = new ActionMessages();
+		FileValidatorUtil.validateFileSize(file, true, errors );
+		if(!errors.isEmpty()){
+			request.setAttribute(ChatConstants.ATTR_SESSION_MAP, map);
+			this.saveErrors(request, errors);
+			return mapping.findForward("success");
+		}
+			
 		if (file.getFileName().length() != 0) {
 			// upload file to repository
 			ChatAttachment newAtt = chatService.uploadFileToContent((Long) map
Index: lams_tool_chat/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r5e2d4a2d74479d27d024a7f32994f35bad5c68f1 -r80f26384c618ffe6659131384045075a35e26b23
--- lams_tool_chat/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5e2d4a2d74479d27d024a7f32994f35bad5c68f1)
+++ lams_tool_chat/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 80f26384c618ffe6659131384045075a35e26b23)
@@ -37,8 +37,15 @@
 			<c:if test="${unsavedChanges}">
 				<fmt:message key="message.unsavedChanges" />
 			</c:if>
+			<logic:messagesPresent>
+				<p class="warning">
+				        <html:messages id="error">
+				            <c:out value="${error}" escapeXml="false"/><br/>
+				        </html:messages>
+				</p>
+			</logic:messagesPresent>
 		</div>
-
+		
 		<lams:help toolSignature="<%=ChatConstants.TOOL_SIGNATURE%>"
 			module="authoring" />