diff --git a/opentech/apply/activity/templates/activity/include/listing_base.html b/opentech/apply/activity/templates/activity/include/listing_base.html
index a9eb4e27a542552a137a3b14d4fcb97305c556da..670772603a881ff879e7c5f2b7e08c6d6e971d77 100644
--- a/opentech/apply/activity/templates/activity/include/listing_base.html
+++ b/opentech/apply/activity/templates/activity/include/listing_base.html
@@ -7,17 +7,21 @@
         <div class="feed__meta js-feed-meta">
             <p class="feed__label feed__label--{{ activity.type }} feed__label--mobile">{{ activity.type|capfirst }}</p>
             <p class="feed__meta-item"><span>{{ activity|display_author:request.user }}</span> – {{ activity.timestamp|date:"Y-m-d H:i" }}</p>
-            {% if activity.user == request.user %}
-                <p class="feed__meta-item feed__meta-item--edit-button">
-                    <a class="link link--edit-submission is-active js-edit-comment" href="#">
-                        Edit
-                        <svg class="icon icon--pen"><use xlink:href="#pen"></use></svg>
-                    </a>
-                </p>
-            {% endif %}
-            {% if activity.edited %}
-                <p class="feed__meta-item feed__meta-item--last-edited">(Last edited: <span class="js-last-edited">{{ activity.edited|date:"Y-m-d H:i" }}</span>)</p>
+
+            {% if editable %}
+                {% if activity.user == request.user %}
+                    <p class="feed__meta-item feed__meta-item--edit-button">
+                        <a class="link link--edit-submission is-active js-edit-comment" href="#">
+                            Edit
+                            <svg class="icon icon--pen"><use xlink:href="#pen"></use></svg>
+                        </a>
+                    </p>
+                {% endif %}
+                {% if activity.edited %}
+                    <p class="feed__meta-item feed__meta-item--last-edited">(Last edited: <span class="js-last-edited">{{ activity.edited|date:"Y-m-d H:i" }}</span>)</p>
+                {% endif %}
             {% endif %}
+
             {% if activity.private %}
                 <p class="feed__meta-item feed__meta-item--right">
                     <svg class="icon icon--eye"><use xlink:href="#eye"></use></svg>
@@ -25,16 +29,21 @@
                 </p>
             {% endif %}
         </div>
+
         <p class="feed__heading">
             {% if submission_title %}
                 updated <a href="{{ activity.submission.get_absolute_url }}">{{ activity.submission.title }}</a>
             {% endif %}
 
-            <div class="feed__comment js-comment" data-id="{{activity.id}}" data-comment="{{activity.message|to_markdown}}">
-                {{ activity|display_for:request.user|submission_links|markdown|bleach }}
-            </div>
+            {% if editable %}
+                <div class="feed__comment js-comment" data-id="{{activity.id}}" data-comment="{{activity.message|to_markdown}}">
+                    {{ activity|display_for:request.user|submission_links|markdown|bleach }}
+                </div>
 
-            <div class="js-edit-block" aria-live="polite"></div>
+                <div class="js-edit-block" aria-live="polite"></div>
+            {% else %}
+                {{ activity|display_for:request.user|submission_links|markdown|bleach }}
+            {% endif %}
 
             {% if not submission_title and activity|user_can_see_related:request.user %}
                 {% with url=activity.related_object.get_absolute_url %}
diff --git a/opentech/apply/funds/templates/funds/applicationsubmission_detail.html b/opentech/apply/funds/templates/funds/applicationsubmission_detail.html
index 1fe5bdc008db857104a3c0c8cdc03c555533db57..f213ec869e0293accebecb7268055d6ecb59492f 100644
--- a/opentech/apply/funds/templates/funds/applicationsubmission_detail.html
+++ b/opentech/apply/funds/templates/funds/applicationsubmission_detail.html
@@ -141,7 +141,7 @@
     <div class="tabs__content" id="tab-2">
         <div class="feed">
             {% include "activity/include/comment_form.html" %}
-            {% include "activity/include/comment_list.html" %}
+            {% include "activity/include/comment_list.html" with editable=True %}
         </div>
     </div>
 
diff --git a/opentech/apply/funds/templates/funds/includes/activity-feed.html b/opentech/apply/funds/templates/funds/includes/activity-feed.html
index 0a3595a6d1765fd7ab028c1bc83200a646f45054..37117315ccd58c1fb4b4da12cd87404d99020698 100644
--- a/opentech/apply/funds/templates/funds/includes/activity-feed.html
+++ b/opentech/apply/funds/templates/funds/includes/activity-feed.html
@@ -15,7 +15,7 @@
 
     <div class="wrapper wrapper--medium wrapper--activity-feed js-tabs-content">
         <div class="tabs__content tabs__content--current" id="tab-1">
-            {% include "activity/include/comment_list.html" with submission_title=True %}
+            {% include "activity/include/comment_list.html" with submission_title=True editable=False %}
         </div>
 
         <div class="tabs__content" id="tab-2">