Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java
===================================================================
diff -u -rf3ef538574537ba41f51bef0335ee6df8495c987 -rbbe739dd7bcd805281fbc282ecf96cdb66ae99c9
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java	(.../LearningController.java)	(revision f3ef538574537ba41f51bef0335ee6df8495c987)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java	(.../LearningController.java)	(revision bbe739dd7bcd805281fbc282ecf96cdb66ae99c9)
@@ -36,6 +36,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
@@ -686,7 +687,7 @@
 		messageForm.getMessage().setSubject(reTitle);
 	    }
 	}
-	
+
 	messageForm.setTmpFileUploadId(FileUtil.generateTmpFileUploadId());
 
 	// Should we show the reflection or not? We shouldn't show it when the View Forum screen is accessed
@@ -717,7 +718,7 @@
 
     /**
      * In case validation was successful, we store message and return JSON object back to HTML
-     * 
+     *
      * @throws ServletException
      */
     @RequestMapping("/replyTopicJSON")
@@ -841,7 +842,7 @@
 
     /**
      * In case validation was successful, we store message and return JSON object back to HTML
-     * 
+     *
      * @throws ServletException
      */
     @RequestMapping("/updateTopicJSON")
@@ -904,7 +905,7 @@
     public String updateMessageHideFlag(HttpServletRequest request) {
 
 	Long msgId = new Long(WebUtil.readLongParam(request, ForumConstants.ATTR_TOPIC_ID));
-	Boolean hideFlag = new Boolean(WebUtil.readBooleanParam(request, "hideFlag"));
+	boolean hideFlag = WebUtil.readBooleanParam(request, "hideFlag");
 
 	// TODO Skipping permissions for now, currently having issues with default learning designs not having an
 	// create_by field
@@ -919,7 +920,7 @@
 
 	// we should be looking at whether a user is a teacher and more specifically staff
 	// if (currentUser.getUserId().equals(forumCreatedBy.getUserId())) {
-	forumService.updateMessageHideFlag(msgId, hideFlag.booleanValue());
+	forumService.updateMessageHideFlag(msgId, hideFlag);
 	// } else {
 	// log.info(currentUser + "does not have permission to hide/show postings in forum: " + forum.getUid());
 	// log.info("Forum created by :" + forumCreatedBy.getUid() + ", Current User is: " + currentUser.getUid());
@@ -1079,7 +1080,7 @@
 
     private void setAttachment(MessageForm messageForm, Message message) throws ServletException {
 	// update attachment
-	if (!messageForm.isHasAttachment()) {
+	if (!messageForm.isHasAttachment() && StringUtils.isNotBlank(messageForm.getTmpFileUploadId())) {
 	    Set<Attachment> attSet = message.getAttachments();
 	    attSet.clear();