diff --git a/src/projects/detail/containers/FeedContainer.js b/src/projects/detail/containers/FeedContainer.js
index 5a1e21bab..4a36eb3bb 100644
--- a/src/projects/detail/containers/FeedContainer.js
+++ b/src/projects/detail/containers/FeedContainer.js
@@ -78,7 +78,7 @@ class FeedView extends React.Component {
     return hasThread || hasComment
   }
 
-  mapFeed(feed, showAll = false) {
+  mapFeed(feed, showAll = false, resetNewComment = false) {
     const { allMembers } = this.props
     const item = _.pick(feed, ['id', 'date', 'read', 'tag', 'title', 'totalPosts', 'userId', 'reference', 'referenceId', 'postIds', 'isAddingComment', 'isLoadingComments', 'error'])
     if (isSystemUser(item.userId)) {
@@ -117,6 +117,10 @@ class FeedView extends React.Component {
       })
     }
     item.newComment = ''
+    if (!resetNewComment) {
+      const feedFromState = _.find(this.state.feeds, f => feed.id === f.id)
+      item.newComment = feedFromState ? feedFromState.newComment : ''
+    }
     item.hasMoreComments = item.comments.length !== item.totalComments
     return item
   }
diff --git a/src/projects/detail/containers/MessagesContainer.js b/src/projects/detail/containers/MessagesContainer.js
index fc81d6c45..a74d99a92 100644
--- a/src/projects/detail/containers/MessagesContainer.js
+++ b/src/projects/detail/containers/MessagesContainer.js
@@ -86,7 +86,7 @@ class MessagesView extends React.Component {
     return hasThread || hasMessage
   }
 
-  mapFeed(feed, isActive, showAll = false) {
+  mapFeed(feed, isActive, showAll = false, resetNewMessage = false) {
     const { allMembers } = this.props
     const item = _.pick(feed, ['id', 'date', 'read', 'tag', 'title', 'totalPosts', 'userId', 'reference', 'referenceId', 'postIds', 'isAddingComment', 'isLoadingComments', 'error'])
     item.isActive = isActive
@@ -126,6 +126,10 @@ class MessagesView extends React.Component {
       })
     }
     item.newMessage = ''
+    if (!resetNewMessage) {
+      const threadFromState = _.find(this.state.threads, t => feed.id === t.id)
+      item.newMessage = threadFromState ? threadFromState.newMessage : ''
+    }
     item.hasMoreMessages = item.messages.length < item.totalComments
     return item
   }