diff --git a/services/web/app/views/project/editor/review-panel.jade b/services/web/app/views/project/editor/review-panel.jade
index a664c02e23..d7c6bc9e52 100644
--- a/services/web/app/views/project/editor/review-panel.jade
+++ b/services/web/app/views/project/editor/review-panel.jade
@@ -206,7 +206,13 @@ script(type='text/ng-template', id='resolvedCommentEntryTemplate')
 			.rp-resolved-comment-context
 				| Quoted text on 
 				span.rp-resolved-comment-context-file {{ thread.docName }}
-				p.rp-resolved-comment-context-quote {{ thread.content }}
+				p.rp-resolved-comment-context-quote
+					span {{ thread.content | limitTo:(isCollapsed ? contentLimit : thread.content.length)}}
+					a.rp-collapse-toggle(
+						href
+						ng-if="needsCollapsing"
+						ng-click="toggleCollapse();"
+					)  {{ isCollapsed ? '(more)' : '(less)' }}
 			.rp-comment(
 				ng-repeat="comment in thread.messages track by comment.id"
 			)
diff --git a/services/web/public/coffee/ide/review-panel/directives/resolvedCommentEntry.coffee b/services/web/public/coffee/ide/review-panel/directives/resolvedCommentEntry.coffee
index fedf17bb94..8b933e05f2 100644
--- a/services/web/public/coffee/ide/review-panel/directives/resolvedCommentEntry.coffee
+++ b/services/web/public/coffee/ide/review-panel/directives/resolvedCommentEntry.coffee
@@ -8,4 +8,13 @@ define [
 			thread: "="
 			permissions: "="
 			onUnresolve: "&"
-			onDelete: "&"
\ No newline at end of file
+			onDelete: "&"
+		link: (scope, element, attrs) ->
+			scope.contentLimit = 40
+			scope.needsCollapsing = scope.thread.content.length > scope.contentLimit
+			scope.isCollapsed = true
+
+			scope.toggleCollapse = () ->
+				scope.isCollapsed = !scope.isCollapsed
+				$timeout () ->
+					scope.$emit "review-panel:layout"
\ No newline at end of file